From f9dd1414be56c38c5b1863abcc11a164ca1fa9bc Mon Sep 17 00:00:00 2001 From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:14:57 +0800 Subject: [PATCH 1/7] upgrade tcgc and compiler --- common/config/rush/pnpm-lock.yaml | 324 ++++++++++++++++------------ packages/typespec-test/package.json | 20 +- packages/typespec-ts/package.json | 30 +-- 3 files changed, 215 insertions(+), 159 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index de19703a04..c9d4a3de5f 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -191,34 +191,34 @@ importers: ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.0 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.33.0 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 - '@typespec/compiler': '>=0.59.0 <1.0.0' - '@typespec/http': '>=0.59.0 <1.0.0' - '@typespec/openapi': '>=0.59.0 <1.0.0' - '@typespec/openapi3': '>=0.59.0 <1.0.0' - '@typespec/rest': '>=0.59.0 <1.0.0' - '@typespec/versioning': '>=0.59.0 <1.0.0' + '@typespec/compiler': '>=0.60.0 <1.0.0' + '@typespec/http': '>=0.60.0 <1.0.0' + '@typespec/openapi': '>=0.60.0 <1.0.0' + '@typespec/openapi3': '>=0.60.0 <1.0.0' + '@typespec/rest': '>=0.60.0 <1.0.0' + '@typespec/versioning': '>=0.60.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 typescript: ~5.5.3 dependencies: - '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/typespec-autorest': 0.46.0_nox762odfgmocfkolhkxdmxppm + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/openapi3': 0.59.0_foc6rhrbx2on4sod3dtg7cmvwy - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/openapi3': 0.60.0_jhug3akjzmkxswlgezkyvyot6u + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 @@ -234,10 +234,10 @@ importers: '@azure-tools/cadl-ranch-expect': ^0.15.3 '@azure-tools/cadl-ranch-specs': ^0.37.1 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.0 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 '@azure/core-lro': ^3.0.0 @@ -253,12 +253,12 @@ importers: '@types/node': ^18.0.0 '@typescript-eslint/eslint-plugin': ^6.8.0 '@typescript-eslint/parser': ^6.8.0 - '@typespec/compiler': '>=0.59.0 <1.0.0' - '@typespec/http': '>=0.59.0 <1.0.0' - '@typespec/openapi': '>=0.59.0, <1.0.0' - '@typespec/rest': '>=0.59.0 <1.0.0' + '@typespec/compiler': '>=0.60.0 <1.0.0' + '@typespec/http': '>=0.60.0 <1.0.0' + '@typespec/openapi': '>=0.60.0, <1.0.0' + '@typespec/rest': '>=0.60.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.59.0 <1.0.0' + '@typespec/versioning': '>=0.60.0 <1.0.0' '@vitest/coverage-istanbul': ~1.6.0 '@vitest/coverage-v8': ~1.6.0 chai: ^4.3.6 @@ -288,14 +288,14 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.1.0 - '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm + '@azure-tools/cadl-ranch': 0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu - '@azure-tools/cadl-ranch-specs': 0.37.1_rlqyi2csgeth45ysk6yolt4cci - '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/cadl-ranch-expect': 0.15.3_iurzlqpw66mehgmvfizzpb7iou + '@azure-tools/cadl-ranch-specs': 0.37.1_dzoc4ebtzkzqdtxubbabiaikxm + '@azure-tools/typespec-autorest': 0.46.0_nox762odfgmocfkolhkxdmxppm + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 '@azure/core-lro': 3.0.0 @@ -311,12 +311,12 @@ importers: '@types/node': 18.18.0 '@typescript-eslint/eslint-plugin': 6.8.0_qf4uxqaifopx7g4oramkqjuumy '@typescript-eslint/parser': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 '@vitest/coverage-istanbul': 1.6.0_vitest@1.6.0 '@vitest/coverage-v8': 1.6.0_vitest@1.6.0 chai: 4.3.8 @@ -440,7 +440,22 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.3_y3yxhtjg35d3g6m2dacugmsjfu: + /@azure-tools/cadl-ranch-expect/0.15.3_iurzlqpw66mehgmvfizzpb7iou: + resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/rest': ~0.59.0 + '@typespec/versioning': ~0.59.0 + dependencies: + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + dev: true + + /@azure-tools/cadl-ranch-expect/0.15.3_nzdxobqne3infbm7or33bvxuye: resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} engines: {node: '>=16.0.0'} peerDependencies: @@ -452,10 +467,10 @@ packages: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 dev: true - /@azure-tools/cadl-ranch-specs/0.37.1_rlqyi2csgeth45ysk6yolt4cci: + /@azure-tools/cadl-ranch-specs/0.37.1_dzoc4ebtzkzqdtxubbabiaikxm: resolution: {integrity: sha512-XR8UxsbTQTSYbgyObcytRP0PLNWrU6cA8dTwQYh+VA/92HrSQYaJ8cQZZ/EyIFjFuSEVGQ74Rx6hpGvfKUrh2w==} engines: {node: '>=16.0.0'} peerDependencies: @@ -467,28 +482,28 @@ packages: '@typespec/versioning': ~0.59.0 '@typespec/xml': ~0.59.0 dependencies: - '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm + '@azure-tools/cadl-ranch': 0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/xml': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/cadl-ranch-expect': 0.15.3_iurzlqpw66mehgmvfizzpb7iou + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/xml': 0.59.0_@typespec+compiler@0.60.0 transitivePeerDependencies: - '@types/express' - supports-color dev: true - /@azure-tools/cadl-ranch/0.14.5_e53zy5pp4bbrxbruosuhuay6sm: + /@azure-tools/cadl-ranch/0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m: resolution: {integrity: sha512-vF98b9ru49YvzcFnuSW6A/gpDOSZcTd/0S42XnmTyTVuF+fp3XOatXTvoUlKnQ25du8hZTm7JFzcZeOova7Xbw==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.4.6 '@azure-tools/cadl-ranch-coverage-sdk': 0.8.4 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu + '@azure-tools/cadl-ranch-expect': 0.15.3_nzdxobqne3infbm7or33bvxuye '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 '@typespec/compiler': 0.59.0 @@ -542,77 +557,77 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.45.0_ch4e7dmaodljkmzs7h7dd2lznu: - resolution: {integrity: sha512-6ycZ0bEfXC0U26FHHEt9smAhxh78SACIDY+u7zLAopRzmxjTuthDdGgYSShuRDu3J+vEBi1fOKpz4cYQkgRkBQ==} + /@azure-tools/typespec-autorest/0.46.0_nox762odfgmocfkolhkxdmxppm: + resolution: {integrity: sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@azure-tools/typespec-azure-resource-manager': ~0.45.0 - '@azure-tools/typespec-client-generator-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 - - /@azure-tools/typespec-azure-core/0.45.0_alrznhyrw66bvx6gp4zrtdfkte: - resolution: {integrity: sha512-GycGMCmaIVSN+TftPtlPJLyeOrglbLmH08ZiZaVMjSih/TQEJM21RGR6d8QdjlkQWN61ntNDRD+RP2uv9tHmqw==} + '@azure-tools/typespec-azure-core': ~0.46.0 + '@azure-tools/typespec-azure-resource-manager': ~0.46.0 + '@azure-tools/typespec-client-generator-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + + /@azure-tools/typespec-azure-core/0.46.0_cg5gm6ub6c3fhoewqvjmoi375i: + resolution: {integrity: sha512-BNE31enSHWtWlrdIKShBS6CNFGk3OYmHSBnWqobcFJkTGXC090EoV2u6otn4BMI99fZRSR4gpwp/kYU9KLE9Jw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/rest': ~0.59.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/rest': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - /@azure-tools/typespec-azure-resource-manager/0.45.0_rxzquxnvxkwebgrumlsfc6ni5i: - resolution: {integrity: sha512-PdhB03P8PoOlUoUWd+CF5WipGzu2Q3ZjT0EAzgQe878DmXvxMq+zYaPJQtvkq9R6jCxFauDSr5gG7Yd4NINAuA==} + /@azure-tools/typespec-azure-resource-manager/0.46.0_riufwwphaotuf3yp3jatanfmeq: + resolution: {integrity: sha512-ileS/0OMp0pmtWU3k0g2ZGfA957nOiEHtFJzAILsYYBFeBWgWuEuCPcKaGYScvlYTTK4Pyplpb7u00RBZBBObQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/typespec-azure-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.45.4_rxzquxnvxkwebgrumlsfc6ni5i: - resolution: {integrity: sha512-QJygwMqhEtBi2tPYs/HAfs0QTowXAwp6QpP/Vd2pHnJAncTV1BN17n/9LLAlMu2CnLimqvTuIN+FfliM28AX9w==} + /@azure-tools/typespec-client-generator-core/0.46.0_riufwwphaotuf3yp3jatanfmeq: + resolution: {integrity: sha512-Ss0dNcOeTyc9CBsNFV6OToLV7OOKidAfeewmKePtY2qAHW+CqWZnVvUHunpFt2jFs6CqjFpgU9g+1wPbLCFj9A==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/typespec-azure-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 change-case: 5.4.4 pluralize: 8.0.0 @@ -2400,6 +2415,27 @@ packages: vscode-languageserver-textdocument: 1.0.11 yaml: 2.4.5 yargs: 17.7.2 + dev: true + + /@typespec/compiler/0.60.0: + resolution: {integrity: sha512-qAS99tJv6RvxSescfxRVal4QWSfdf3BzIOgE8+Az6emL68aTE/W8zQ0Ijpgmhax7sC2AnLTxCK1tM9kj1YguRw==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + '@babel/code-frame': 7.24.7 + ajv: 8.17.1 + change-case: 5.4.4 + globby: 14.0.2 + mustache: 4.2.0 + picocolors: 1.0.1 + prettier: 3.3.3 + prompts: 2.4.2 + semver: 7.6.3 + temporal-polyfill: 0.2.5 + vscode-languageserver: 9.0.1 + vscode-languageserver-textdocument: 1.0.11 + yaml: 2.4.5 + yargs: 17.7.2 /@typespec/http/0.59.0_@typespec+compiler@0.59.0: resolution: {integrity: sha512-P8kJBHmkqYHhojO97Tnj8FH+UInWzGBl2I9Z6ZX6sVUVW9/87hoovgCcVmvU1xMUD/xvKzX3m70fbRXhkocsGQ==} @@ -2408,32 +2444,41 @@ packages: '@typespec/compiler': ~0.59.0 dependencies: '@typespec/compiler': 0.59.0 + dev: true - /@typespec/openapi/0.59.0_kqkvcwi4aithpv7x2xgy7toc2q: - resolution: {integrity: sha512-do1Dm5w0MuK3994gYTBg6qMfgeIxmmsDqnz3zimYKMPpbnUBi4F6/o4iCfn0Fn9kaNl+H6UlOzZpsZW9xHui1Q==} + /@typespec/http/0.60.0_@typespec+compiler@0.60.0: + resolution: {integrity: sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 + '@typespec/compiler': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.0 - /@typespec/openapi3/0.59.0_foc6rhrbx2on4sod3dtg7cmvwy: - resolution: {integrity: sha512-xwdWPPRtjsLxXjsebNppaHrFPF6rJiWkAEHCsK0elwvaPSruZvYfPhXpx1HnNkC2glb0NHgmxvXg7EmMwIYYcA==} + /@typespec/openapi/0.60.0_2kcgc74urgmxhgsn3mq2to6274: + resolution: {integrity: sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + dependencies: + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + + /@typespec/openapi3/0.60.0_jhug3akjzmkxswlgezkyvyot6u: + resolution: {integrity: sha512-gvrTHZACdeQtV7GfhVOHqkyTgMFyM2nKAIiz2P83LIncMCDUc00bGKGmaBk+xpuwKtCJyxBeVpCbID31YAq96g==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/versioning': ~0.59.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/versioning': ~0.60.0 dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 yaml: 2.4.5 transitivePeerDependencies: - openapi-types @@ -2448,6 +2493,17 @@ packages: dependencies: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + dev: true + + /@typespec/rest/0.60.0_2kcgc74urgmxhgsn3mq2to6274: + resolution: {integrity: sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + dependencies: + '@typespec/compiler': 0.60.0 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2460,21 +2516,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.59.0_@typespec+compiler@0.59.0: - resolution: {integrity: sha512-aihO/ux0lLmsuYAdGVkiBflSudcZokYG42SELk1FtMFo609G3Pd7ep7hau6unBnMIceQZejB0ow5UGRupK4X5A==} + /@typespec/versioning/0.60.0_@typespec+compiler@0.60.0: + resolution: {integrity: sha512-SqxCQ9qMw5fdR7WP6/GFLzwcFwxhv+uHlzJGVcTd1GtIAu5qj2X4VmzFuNQyu+QenI+5uOSrEEywEXn0YRTZSg==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 + '@typespec/compiler': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 + '@typespec/compiler': 0.60.0 - /@typespec/xml/0.59.0_@typespec+compiler@0.59.0: + /@typespec/xml/0.59.0_@typespec+compiler@0.60.0: resolution: {integrity: sha512-UoSsEmm7SXEtL9OXsqotu1TjruJSobqZMhUKAAlC9EP2WfQIHLRfBu7xaZB0sgwq7CM6zy/Hq1RZfQyL1KqEvg==} engines: {node: '>=18.0.0'} peerDependencies: '@typespec/compiler': ~0.59.0 dependencies: - '@typespec/compiler': 0.59.0 + '@typespec/compiler': 0.60.0 dev: true /@ungap/promise-all-settled/1.1.2: diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index 4adee94fe4..9f6d99b06a 100644 --- a/packages/typespec-test/package.json +++ b/packages/typespec-test/package.json @@ -4,16 +4,16 @@ "type": "module", "dependencies": { "@azure-tools/typespec-ts": "workspace:^0.33.0", - "@typespec/openapi": ">=0.59.0 <1.0.0", - "@azure-tools/typespec-autorest": ">=0.45.0 <1.0.0", - "@typespec/openapi3": ">=0.59.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0", - "@typespec/compiler": ">=0.59.0 <1.0.0", - "@typespec/http": ">=0.59.0 <1.0.0", - "@typespec/rest": ">=0.59.0 <1.0.0", - "@typespec/versioning": ">=0.59.0 <1.0.0", + "@typespec/openapi": ">=0.60.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.46.0 <1.0.0", + "@typespec/openapi3": ">=0.60.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.46.0 <1.0.0", + "@typespec/compiler": ">=0.60.0 <1.0.0", + "@typespec/http": ">=0.60.0 <1.0.0", + "@typespec/rest": ">=0.60.0 <1.0.0", + "@typespec/versioning": ">=0.60.0 <1.0.0", "prettier": "^3.1.0" }, "devDependencies": { diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index 0e5e5e1e1c..d5d731990a 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -67,10 +67,10 @@ "@azure-tools/cadl-ranch-specs": "^0.37.1", "@azure-tools/cadl-ranch": "^0.14.5", "@azure-tools/cadl-ranch-api": "^0.4.6", - "@azure-tools/typespec-autorest": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.6.0", "@azure/core-lro": "^3.0.0", @@ -85,12 +85,12 @@ "@types/node": "^18.0.0", "@typescript-eslint/eslint-plugin": "^6.8.0", "@typescript-eslint/parser": "^6.8.0", - "@typespec/compiler": ">=0.59.0 <1.0.0", - "@typespec/http": ">=0.59.0 <1.0.0", - "@typespec/openapi": ">=0.59.0, <1.0.0", - "@typespec/rest": ">=0.59.0 <1.0.0", + "@typespec/compiler": ">=0.60.0 <1.0.0", + "@typespec/http": ">=0.60.0 <1.0.0", + "@typespec/openapi": ">=0.60.0, <1.0.0", + "@typespec/rest": ">=0.60.0 <1.0.0", "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2", - "@typespec/versioning": ">=0.59.0 <1.0.0", + "@typespec/versioning": ">=0.60.0 <1.0.0", "chai": "^4.3.6", "chalk": "^4.0.0", "cross-env": "^7.0.3", @@ -110,12 +110,12 @@ "tsx": "^4.16.5" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0", - "@typespec/compiler": ">=0.59.0 <1.0.0", - "@typespec/http": ">=0.59.0 <1.0.0", - "@typespec/rest": ">=0.59.0 <1.0.0", - "@typespec/versioning": ">=0.59.0 <1.0.0" + "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", + "@typespec/compiler": ">=0.60.0 <1.0.0", + "@typespec/http": ">=0.60.0 <1.0.0", + "@typespec/rest": ">=0.60.0 <1.0.0", + "@typespec/versioning": ">=0.60.0 <1.0.0" }, "dependencies": { "@azure-tools/rlc-common": "workspace:^0.33.0", From 89fdb9d4691470e3c3baebd2d192543e87427f20 Mon Sep 17 00:00:00 2001 From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com> Date: Wed, 11 Sep 2024 15:38:49 +0800 Subject: [PATCH 2/7] fix ci --- .../generated/openapi/v1.1/openapi.json | 3 ++- .../generated/openapi/2022-05-13/openapi.json | 3 ++- .../generated/openapi/openapi.json | 18 +++++++++++------- .../generated/typespec-ts/src/responses.ts | 6 +++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/packages/typespec-test/test/anomalyDetector/generated/openapi/v1.1/openapi.json b/packages/typespec-test/test/anomalyDetector/generated/openapi/v1.1/openapi.json index 6991cbb2e2..f1de586dc8 100644 --- a/packages/typespec-test/test/anomalyDetector/generated/openapi/v1.1/openapi.json +++ b/packages/typespec-test/test/anomalyDetector/generated/openapi/v1.1/openapi.json @@ -148,7 +148,8 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": "nextLink", + "itemName": "models" } }, "post": { diff --git a/packages/typespec-test/test/confidentialLedger/generated/openapi/2022-05-13/openapi.json b/packages/typespec-test/test/confidentialLedger/generated/openapi/2022-05-13/openapi.json index 27beacd9db..86f33cd6af 100644 --- a/packages/typespec-test/test/confidentialLedger/generated/openapi/2022-05-13/openapi.json +++ b/packages/typespec-test/test/confidentialLedger/generated/openapi/2022-05-13/openapi.json @@ -206,7 +206,8 @@ } }, "x-ms-pageable": { - "nextLinkName": "nextLink" + "nextLinkName": "nextLink", + "itemName": "entries" } } }, diff --git a/packages/typespec-test/test/todo_non_branded/generated/openapi/openapi.json b/packages/typespec-test/test/todo_non_branded/generated/openapi/openapi.json index c55c61aa9e..e749bb9762 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/openapi/openapi.json +++ b/packages/typespec-test/test/todo_non_branded/generated/openapi/openapi.json @@ -385,7 +385,8 @@ "required": true, "schema": { "type": "string" - } + }, + "explode": false } ], "responses": { @@ -414,7 +415,7 @@ } }, "409": { - "description": "The request conflicts with the current state of the server.", + "description": "The user already exists", "content": { "application/json": { "schema": { @@ -424,7 +425,7 @@ } }, "422": { - "description": "Client error", + "description": "The user is invalid (e.g. forgot to enter email address)", "content": { "application/json": { "schema": { @@ -464,7 +465,8 @@ "required": true, "schema": { "type": "string" - } + }, + "explode": false } ], "responses": { @@ -472,7 +474,7 @@ "description": "The request has succeeded." }, "422": { - "description": "Client error", + "description": "The user is invalid (e.g. forgot to enter email address)", "content": { "application/json": { "schema": { @@ -501,7 +503,8 @@ "type": "integer", "format": "int32", "default": 50 - } + }, + "explode": false }, "TodoItems.PaginationControls.offset": { "name": "offset", @@ -512,7 +515,8 @@ "type": "integer", "format": "int32", "default": 0 - } + }, + "explode": false } }, "schemas": { diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/responses.ts b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/responses.ts index c2c1420f36..7e056ca567 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/responses.ts +++ b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/src/responses.ts @@ -17,13 +17,13 @@ export interface UsersCreate200Response extends HttpResponse { body: UserCreatedResponseOutput; } -/** The request conflicts with the current state of the server. */ +/** The user already exists */ export interface UsersCreate409Response extends HttpResponse { status: "409"; body: UserExistsResponseOutput; } -/** Client error */ +/** The user is invalid (e.g. forgot to enter email address) */ export interface UsersCreate422Response extends HttpResponse { status: "422"; body: InvalidUserResponseOutput; @@ -34,7 +34,7 @@ export interface UsersValidate200Response extends HttpResponse { status: "200"; } -/** Client error */ +/** The user is invalid (e.g. forgot to enter email address) */ export interface UsersValidate422Response extends HttpResponse { status: "422"; body: InvalidUserResponseOutput; From c975f587e6e65bc791611c1bc46959683aaa4224 Mon Sep 17 00:00:00 2001 From: Di Jiao Date: Thu, 19 Sep 2024 16:00:17 +0800 Subject: [PATCH 3/7] update tcgc to v0.46.1 --- common/config/rush/pnpm-lock.yaml | 20 ++++++++++---------- packages/typespec-test/package.json | 2 +- packages/typespec-ts/package.json | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index c9d4a3de5f..685ec0b793 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -194,7 +194,7 @@ importers: '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.33.0 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 @@ -208,10 +208,10 @@ importers: ts-node: ^8.5.2 typescript: ~5.5.3 dependencies: - '@azure-tools/typespec-autorest': 0.46.0_nox762odfgmocfkolhkxdmxppm + '@azure-tools/typespec-autorest': 0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq '@azure-tools/typespec-ts': link:../typespec-ts '@typespec/compiler': 0.60.0 '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 @@ -237,7 +237,7 @@ importers: '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 '@azure/core-lro': ^3.0.0 @@ -292,10 +292,10 @@ importers: '@azure-tools/cadl-ranch-api': 0.4.6 '@azure-tools/cadl-ranch-expect': 0.15.3_iurzlqpw66mehgmvfizzpb7iou '@azure-tools/cadl-ranch-specs': 0.37.1_dzoc4ebtzkzqdtxubbabiaikxm - '@azure-tools/typespec-autorest': 0.46.0_nox762odfgmocfkolhkxdmxppm + '@azure-tools/typespec-autorest': 0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 '@azure/core-lro': 3.0.0 @@ -557,7 +557,7 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.46.0_nox762odfgmocfkolhkxdmxppm: + /@azure-tools/typespec-autorest/0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy: resolution: {integrity: sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==} engines: {node: '>=18.0.0'} peerDependencies: @@ -572,7 +572,7 @@ packages: dependencies: '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.0_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq '@typespec/compiler': 0.60.0 '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 @@ -611,8 +611,8 @@ packages: change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.46.0_riufwwphaotuf3yp3jatanfmeq: - resolution: {integrity: sha512-Ss0dNcOeTyc9CBsNFV6OToLV7OOKidAfeewmKePtY2qAHW+CqWZnVvUHunpFt2jFs6CqjFpgU9g+1wPbLCFj9A==} + /@azure-tools/typespec-client-generator-core/0.46.1_riufwwphaotuf3yp3jatanfmeq: + resolution: {integrity: sha512-mXA+ia5vS0yxPnxRW/vjKBJP5U4e4T5Gcr+GRjuS4+1gGolmklV2prJsXdR4iFLSVFfcH1zBFXQ2OPqsI5GMJw==} engines: {node: '>=18.0.0'} peerDependencies: '@azure-tools/typespec-azure-core': ~0.46.0 diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index 9f6d99b06a..5cb1ac392a 100644 --- a/packages/typespec-test/package.json +++ b/packages/typespec-test/package.json @@ -8,7 +8,7 @@ "@azure-tools/typespec-autorest": ">=0.46.0 <1.0.0", "@typespec/openapi3": ">=0.60.0 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.1 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.46.0 <1.0.0", "@typespec/compiler": ">=0.60.0 <1.0.0", "@typespec/http": ">=0.60.0 <1.0.0", diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index d5d731990a..46eb702908 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -70,7 +70,7 @@ "@azure-tools/typespec-autorest": ">=0.46.0 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.46.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.1 <1.0.0", "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.6.0", "@azure/core-lro": "^3.0.0", @@ -111,7 +111,7 @@ }, "peerDependencies": { "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.46.1 <1.0.0", "@typespec/compiler": ">=0.60.0 <1.0.0", "@typespec/http": ">=0.60.0 <1.0.0", "@typespec/rest": ">=0.60.0 <1.0.0", From cf0587c125856a5ee02a3afb270fe13847f13b70 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Fri, 20 Sep 2024 10:38:00 +0800 Subject: [PATCH 4/7] Update to the main --- common/config/rush/pnpm-lock.yaml | 432 +++++++++++++----------------- 1 file changed, 188 insertions(+), 244 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 685ec0b793..84da7bfd40 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -69,7 +69,7 @@ importers: ts-morph: ^23.0.0 ts-node: ^8.5.2 tslib: ^2.3.1 - typescript: ~5.5.3 + typescript: ~5.6.2 wait-port: ^0.2.6 webpack: ^5.72.0 webpack-cli: ^4.9.2 @@ -113,8 +113,8 @@ importers: '@types/sinon': 10.0.17 '@types/xmlbuilder': 0.0.34 '@types/yargs': 17.0.25 - '@typescript-eslint/eslint-plugin': 6.8.0_qf4uxqaifopx7g4oramkqjuumy - '@typescript-eslint/parser': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i + '@typescript-eslint/eslint-plugin': 6.8.0_wroavni7rd6ng5lxj6jm5p2pxq + '@typescript-eslint/parser': 6.8.0_wgnkk2eh2432jxos7omdkkhhte autorest: 3.6.3 buffer: 6.0.3 chai: 4.3.8 @@ -132,13 +132,13 @@ importers: npm-run-all: 4.1.5 openapi-types: 7.2.3 path-browserify: 1.0.1 - puppeteer: 22.4.1_typescript@5.5.3 + puppeteer: 22.4.1_typescript@5.6.2 rimraf: 5.0.4 sinon: 10.0.1 source-map-loader: 1.1.3_webpack@5.88.2 - ts-node: 8.10.2_typescript@5.5.3 + ts-node: 8.10.2_typescript@5.6.2 tslib: 2.6.2 - typescript: 5.5.3 + typescript: 5.6.2 wait-port: 0.2.14 webpack: 5.88.2_webpack-cli@4.10.0 webpack-cli: 4.10.0_webpack@5.88.2 @@ -165,7 +165,7 @@ importers: rimraf: ^5.0.0 ts-morph: ^23.0.0 ts-node: ^10.7.0 - typescript: ~5.5.3 + typescript: ~5.6.2 dependencies: handlebars: 4.7.8 lodash: 4.17.21 @@ -176,8 +176,8 @@ importers: '@types/lodash': 4.14.199 '@types/mocha': 10.0.1 '@types/node': 18.18.0 - '@typescript-eslint/eslint-plugin': 6.8.0_qf4uxqaifopx7g4oramkqjuumy - '@typescript-eslint/parser': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i + '@typescript-eslint/eslint-plugin': 6.8.0_wroavni7rd6ng5lxj6jm5p2pxq + '@typescript-eslint/parser': 6.8.0_wgnkk2eh2432jxos7omdkkhhte chai: 4.3.8 cross-env: 7.0.3 eslint: 8.50.0 @@ -186,45 +186,45 @@ importers: mocha: 10.2.0 prettier: 3.1.1 rimraf: 5.0.4 - ts-node: 10.9.1_zn7yththkfcgqhkmzzvsumdxyy - typescript: 5.5.3 + ts-node: 10.9.1_jaxbkr345bnladzl3q4nioo63e + typescript: 5.6.2 ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.33.0 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 - '@typespec/compiler': '>=0.60.0 <1.0.0' - '@typespec/http': '>=0.60.0 <1.0.0' - '@typespec/openapi': '>=0.60.0 <1.0.0' - '@typespec/openapi3': '>=0.60.0 <1.0.0' - '@typespec/rest': '>=0.60.0 <1.0.0' - '@typespec/versioning': '>=0.60.0 <1.0.0' + '@typespec/compiler': '>=0.59.0 <1.0.0' + '@typespec/http': '>=0.59.0 <1.0.0' + '@typespec/openapi': '>=0.59.0 <1.0.0' + '@typespec/openapi3': '>=0.59.0 <1.0.0' + '@typespec/rest': '>=0.59.0 <1.0.0' + '@typespec/versioning': '>=0.59.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 - typescript: ~5.5.3 + typescript: ~5.6.2 dependencies: - '@azure-tools/typespec-autorest': 0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/openapi3': 0.60.0_jhug3akjzmkxswlgezkyvyot6u - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/openapi3': 0.59.0_foc6rhrbx2on4sod3dtg7cmvwy + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 '@types/node': 18.18.0 - ts-node: 8.10.2_typescript@5.5.3 - typescript: 5.5.3 + ts-node: 8.10.2_typescript@5.6.2 + typescript: 5.6.2 ../../packages/typespec-ts: specifiers: @@ -234,13 +234,13 @@ importers: '@azure-tools/cadl-ranch-expect': ^0.15.3 '@azure-tools/cadl-ranch-specs': ^0.37.1 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 - '@azure/core-lro': ^3.0.0 + '@azure/core-lro': ^3.1.0 '@azure/core-paging': ^1.5.0 '@azure/core-rest-pipeline': ^1.14.0 '@azure/core-util': ^1.4.0 @@ -253,12 +253,12 @@ importers: '@types/node': ^18.0.0 '@typescript-eslint/eslint-plugin': ^6.8.0 '@typescript-eslint/parser': ^6.8.0 - '@typespec/compiler': '>=0.60.0 <1.0.0' - '@typespec/http': '>=0.60.0 <1.0.0' - '@typespec/openapi': '>=0.60.0, <1.0.0' - '@typespec/rest': '>=0.60.0 <1.0.0' + '@typespec/compiler': '>=0.59.0 <1.0.0' + '@typespec/http': '>=0.59.0 <1.0.0' + '@typespec/openapi': '>=0.59.0, <1.0.0' + '@typespec/rest': '>=0.59.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.60.0 <1.0.0' + '@typespec/versioning': '>=0.59.0 <1.0.0' '@vitest/coverage-istanbul': ~1.6.0 '@vitest/coverage-v8': ~1.6.0 chai: ^4.3.6 @@ -277,7 +277,7 @@ importers: ts-node: ~10.9.1 tslib: ^2.3.1 tsx: ^4.16.5 - typescript: ~5.5.3 + typescript: ~5.6.2 vitest: ~1.6.0 dependencies: '@azure-tools/rlc-common': link:../rlc-common @@ -288,17 +288,17 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.1.0 - '@azure-tools/cadl-ranch': 0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m + '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_iurzlqpw66mehgmvfizzpb7iou - '@azure-tools/cadl-ranch-specs': 0.37.1_dzoc4ebtzkzqdtxubbabiaikxm - '@azure-tools/typespec-autorest': 0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq + '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu + '@azure-tools/cadl-ranch-specs': 0.37.1_rlqyi2csgeth45ysk6yolt4cci + '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 - '@azure/core-lro': 3.0.0 + '@azure/core-lro': 3.1.0 '@azure/core-paging': 1.5.0 '@azure/core-rest-pipeline': 1.14.0 '@azure/core-util': 1.5.0 @@ -309,14 +309,14 @@ importers: '@types/lodash': 4.17.4 '@types/mocha': 10.0.6 '@types/node': 18.18.0 - '@typescript-eslint/eslint-plugin': 6.8.0_qf4uxqaifopx7g4oramkqjuumy - '@typescript-eslint/parser': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typescript-eslint/eslint-plugin': 6.8.0_wroavni7rd6ng5lxj6jm5p2pxq + '@typescript-eslint/parser': 6.8.0_wgnkk2eh2432jxos7omdkkhhte + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 '@vitest/coverage-istanbul': 1.6.0_vitest@1.6.0 '@vitest/coverage-v8': 1.6.0_vitest@1.6.0 chai: 4.3.8 @@ -328,9 +328,9 @@ importers: mocha: 10.4.0 npm-run-all: 4.1.5 rimraf: 5.0.4 - ts-node: 10.9.1_zn7yththkfcgqhkmzzvsumdxyy + ts-node: 10.9.1_jaxbkr345bnladzl3q4nioo63e tsx: 4.17.0 - typescript: 5.5.3 + typescript: 5.6.2 vitest: 1.6.0_@types+node@18.18.0 packages: @@ -440,22 +440,7 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.3_iurzlqpw66mehgmvfizzpb7iou: - resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} - engines: {node: '>=16.0.0'} - peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 - dev: true - - /@azure-tools/cadl-ranch-expect/0.15.3_nzdxobqne3infbm7or33bvxuye: + /@azure-tools/cadl-ranch-expect/0.15.3_y3yxhtjg35d3g6m2dacugmsjfu: resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} engines: {node: '>=16.0.0'} peerDependencies: @@ -467,10 +452,10 @@ packages: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 dev: true - /@azure-tools/cadl-ranch-specs/0.37.1_dzoc4ebtzkzqdtxubbabiaikxm: + /@azure-tools/cadl-ranch-specs/0.37.1_rlqyi2csgeth45ysk6yolt4cci: resolution: {integrity: sha512-XR8UxsbTQTSYbgyObcytRP0PLNWrU6cA8dTwQYh+VA/92HrSQYaJ8cQZZ/EyIFjFuSEVGQ74Rx6hpGvfKUrh2w==} engines: {node: '>=16.0.0'} peerDependencies: @@ -482,28 +467,28 @@ packages: '@typespec/versioning': ~0.59.0 '@typespec/xml': ~0.59.0 dependencies: - '@azure-tools/cadl-ranch': 0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m + '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_iurzlqpw66mehgmvfizzpb7iou - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/xml': 0.59.0_@typespec+compiler@0.60.0 + '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/xml': 0.59.0_@typespec+compiler@0.59.0 transitivePeerDependencies: - '@types/express' - supports-color dev: true - /@azure-tools/cadl-ranch/0.14.5_mvr3hyfgfqdt7x3t7x7fo2xh6m: + /@azure-tools/cadl-ranch/0.14.5_e53zy5pp4bbrxbruosuhuay6sm: resolution: {integrity: sha512-vF98b9ru49YvzcFnuSW6A/gpDOSZcTd/0S42XnmTyTVuF+fp3XOatXTvoUlKnQ25du8hZTm7JFzcZeOova7Xbw==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.4.6 '@azure-tools/cadl-ranch-coverage-sdk': 0.8.4 - '@azure-tools/cadl-ranch-expect': 0.15.3_nzdxobqne3infbm7or33bvxuye + '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 '@typespec/compiler': 0.59.0 @@ -557,77 +542,77 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.46.0_5ny7bbelbj6ljbgq6slmc4uhvy: - resolution: {integrity: sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==} + /@azure-tools/typespec-autorest/0.45.0_ch4e7dmaodljkmzs7h7dd2lznu: + resolution: {integrity: sha512-6ycZ0bEfXC0U26FHHEt9smAhxh78SACIDY+u7zLAopRzmxjTuthDdGgYSShuRDu3J+vEBi1fOKpz4cYQkgRkBQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.46.0 - '@azure-tools/typespec-azure-resource-manager': ~0.46.0 - '@azure-tools/typespec-client-generator-core': ~0.46.0 - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - '@typespec/openapi': ~0.60.0 - '@typespec/rest': ~0.60.0 - '@typespec/versioning': ~0.60.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@azure-tools/typespec-azure-resource-manager': 0.46.0_riufwwphaotuf3yp3jatanfmeq - '@azure-tools/typespec-client-generator-core': 0.46.1_riufwwphaotuf3yp3jatanfmeq - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 - - /@azure-tools/typespec-azure-core/0.46.0_cg5gm6ub6c3fhoewqvjmoi375i: - resolution: {integrity: sha512-BNE31enSHWtWlrdIKShBS6CNFGk3OYmHSBnWqobcFJkTGXC090EoV2u6otn4BMI99fZRSR4gpwp/kYU9KLE9Jw==} + '@azure-tools/typespec-azure-core': ~0.45.0 + '@azure-tools/typespec-azure-resource-manager': ~0.45.0 + '@azure-tools/typespec-client-generator-core': ~0.45.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/openapi': ~0.59.0 + '@typespec/rest': ~0.59.0 + '@typespec/versioning': ~0.59.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + + /@azure-tools/typespec-azure-core/0.45.0_alrznhyrw66bvx6gp4zrtdfkte: + resolution: {integrity: sha512-GycGMCmaIVSN+TftPtlPJLyeOrglbLmH08ZiZaVMjSih/TQEJM21RGR6d8QdjlkQWN61ntNDRD+RP2uv9tHmqw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - '@typespec/rest': ~0.60.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/rest': ~0.59.0 dependencies: - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - /@azure-tools/typespec-azure-resource-manager/0.46.0_riufwwphaotuf3yp3jatanfmeq: - resolution: {integrity: sha512-ileS/0OMp0pmtWU3k0g2ZGfA957nOiEHtFJzAILsYYBFeBWgWuEuCPcKaGYScvlYTTK4Pyplpb7u00RBZBBObQ==} + /@azure-tools/typespec-azure-resource-manager/0.45.0_rxzquxnvxkwebgrumlsfc6ni5i: + resolution: {integrity: sha512-PdhB03P8PoOlUoUWd+CF5WipGzu2Q3ZjT0EAzgQe878DmXvxMq+zYaPJQtvkq9R6jCxFauDSr5gG7Yd4NINAuA==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.46.0 - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - '@typespec/openapi': ~0.60.0 - '@typespec/rest': ~0.60.0 - '@typespec/versioning': ~0.60.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@azure-tools/typespec-azure-core': ~0.45.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/openapi': ~0.59.0 + '@typespec/rest': ~0.59.0 + '@typespec/versioning': ~0.59.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.46.1_riufwwphaotuf3yp3jatanfmeq: - resolution: {integrity: sha512-mXA+ia5vS0yxPnxRW/vjKBJP5U4e4T5Gcr+GRjuS4+1gGolmklV2prJsXdR4iFLSVFfcH1zBFXQ2OPqsI5GMJw==} + /@azure-tools/typespec-client-generator-core/0.45.4_rxzquxnvxkwebgrumlsfc6ni5i: + resolution: {integrity: sha512-QJygwMqhEtBi2tPYs/HAfs0QTowXAwp6QpP/Vd2pHnJAncTV1BN17n/9LLAlMu2CnLimqvTuIN+FfliM28AX9w==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.46.0 - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - '@typespec/openapi': ~0.60.0 - '@typespec/rest': ~0.60.0 - '@typespec/versioning': ~0.60.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.46.0_cg5gm6ub6c3fhoewqvjmoi375i - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/rest': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@azure-tools/typespec-azure-core': ~0.45.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/openapi': ~0.59.0 + '@typespec/rest': ~0.59.0 + '@typespec/versioning': ~0.59.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 change-case: 5.4.4 pluralize: 8.0.0 @@ -733,8 +718,8 @@ packages: '@azure/logger': 1.0.4 tslib: 2.6.2 - /@azure/core-lro/3.0.0: - resolution: {integrity: sha512-t46lsD0jDJ1o71hIGzoUfT9jH+rIkNJAJLhhPqW8XLbPueHBnP4x5PNJ2szXlLoztH/00OcUUH3FbFnAntOSWA==} + /@azure/core-lro/3.1.0: + resolution: {integrity: sha512-W/vVbZumJLFMvmiUspyBzKai0O3HiD6KmsWnpCLasFr92qmafwgz+tThmnpMFH7vCS4MUl4ehFd0Z6OWb8BPog==} engines: {node: '>=18.0.0'} dependencies: '@azure/abort-controller': 2.1.2 @@ -2265,7 +2250,7 @@ packages: dev: true optional: true - /@typescript-eslint/eslint-plugin/6.8.0_qf4uxqaifopx7g4oramkqjuumy: + /@typescript-eslint/eslint-plugin/6.8.0_wroavni7rd6ng5lxj6jm5p2pxq: resolution: {integrity: sha512-GosF4238Tkes2SHPQ1i8f6rMtG6zlKwMEB0abqSJ3Npvos+doIlc/ATG+vX1G9coDF3Ex78zM3heXHLyWEwLUw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2277,10 +2262,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.8.2 - '@typescript-eslint/parser': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i + '@typescript-eslint/parser': 6.8.0_wgnkk2eh2432jxos7omdkkhhte '@typescript-eslint/scope-manager': 6.8.0 - '@typescript-eslint/type-utils': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i - '@typescript-eslint/utils': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i + '@typescript-eslint/type-utils': 6.8.0_wgnkk2eh2432jxos7omdkkhhte + '@typescript-eslint/utils': 6.8.0_wgnkk2eh2432jxos7omdkkhhte '@typescript-eslint/visitor-keys': 6.8.0 debug: 4.3.4 eslint: 8.50.0 @@ -2288,13 +2273,13 @@ packages: ignore: 5.2.4 natural-compare: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.3_typescript@5.5.3 - typescript: 5.5.3 + ts-api-utils: 1.0.3_typescript@5.6.2 + typescript: 5.6.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser/6.8.0_5hvrknbmeu6sajfm3eyubyzq5i: + /@typescript-eslint/parser/6.8.0_wgnkk2eh2432jxos7omdkkhhte: resolution: {integrity: sha512-5tNs6Bw0j6BdWuP8Fx+VH4G9fEPDxnVI7yH1IAPkQH5RUtvKwRoqdecAPdQXv4rSOADAaz1LFBZvZG7VbXivSg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2306,11 +2291,11 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.8.0 '@typescript-eslint/types': 6.8.0 - '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.5.3 + '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.6.2 '@typescript-eslint/visitor-keys': 6.8.0 debug: 4.3.4 eslint: 8.50.0 - typescript: 5.5.3 + typescript: 5.6.2 transitivePeerDependencies: - supports-color dev: true @@ -2323,7 +2308,7 @@ packages: '@typescript-eslint/visitor-keys': 6.8.0 dev: true - /@typescript-eslint/type-utils/6.8.0_5hvrknbmeu6sajfm3eyubyzq5i: + /@typescript-eslint/type-utils/6.8.0_wgnkk2eh2432jxos7omdkkhhte: resolution: {integrity: sha512-RYOJdlkTJIXW7GSldUIHqc/Hkto8E+fZN96dMIFhuTJcQwdRoGN2rEWA8U6oXbLo0qufH7NPElUb+MceHtz54g==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2333,12 +2318,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.5.3 - '@typescript-eslint/utils': 6.8.0_5hvrknbmeu6sajfm3eyubyzq5i + '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.6.2 + '@typescript-eslint/utils': 6.8.0_wgnkk2eh2432jxos7omdkkhhte debug: 4.3.4 eslint: 8.50.0 - ts-api-utils: 1.0.3_typescript@5.5.3 - typescript: 5.5.3 + ts-api-utils: 1.0.3_typescript@5.6.2 + typescript: 5.6.2 transitivePeerDependencies: - supports-color dev: true @@ -2348,7 +2333,7 @@ packages: engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree/6.8.0_typescript@5.5.3: + /@typescript-eslint/typescript-estree/6.8.0_typescript@5.6.2: resolution: {integrity: sha512-ISgV0lQ8XgW+mvv5My/+iTUdRmGspducmQcDw5JxznasXNnZn3SKNrTRuMsEXv+V/O+Lw9AGcQCfVaOPCAk/Zg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2363,13 +2348,13 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 - ts-api-utils: 1.0.3_typescript@5.5.3 - typescript: 5.5.3 + ts-api-utils: 1.0.3_typescript@5.6.2 + typescript: 5.6.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils/6.8.0_5hvrknbmeu6sajfm3eyubyzq5i: + /@typescript-eslint/utils/6.8.0_wgnkk2eh2432jxos7omdkkhhte: resolution: {integrity: sha512-dKs1itdE2qFG4jr0dlYLQVppqTE+Itt7GmIf/vX6CSvsW+3ov8PbWauVKyyfNngokhIO9sKZeRGCUo1+N7U98Q==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -2380,7 +2365,7 @@ packages: '@types/semver': 7.5.3 '@typescript-eslint/scope-manager': 6.8.0 '@typescript-eslint/types': 6.8.0 - '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.5.3 + '@typescript-eslint/typescript-estree': 6.8.0_typescript@5.6.2 eslint: 8.50.0 semver: 7.6.3 transitivePeerDependencies: @@ -2415,27 +2400,6 @@ packages: vscode-languageserver-textdocument: 1.0.11 yaml: 2.4.5 yargs: 17.7.2 - dev: true - - /@typespec/compiler/0.60.0: - resolution: {integrity: sha512-qAS99tJv6RvxSescfxRVal4QWSfdf3BzIOgE8+Az6emL68aTE/W8zQ0Ijpgmhax7sC2AnLTxCK1tM9kj1YguRw==} - engines: {node: '>=18.0.0'} - hasBin: true - dependencies: - '@babel/code-frame': 7.24.7 - ajv: 8.17.1 - change-case: 5.4.4 - globby: 14.0.2 - mustache: 4.2.0 - picocolors: 1.0.1 - prettier: 3.3.3 - prompts: 2.4.2 - semver: 7.6.3 - temporal-polyfill: 0.2.5 - vscode-languageserver: 9.0.1 - vscode-languageserver-textdocument: 1.0.11 - yaml: 2.4.5 - yargs: 17.7.2 /@typespec/http/0.59.0_@typespec+compiler@0.59.0: resolution: {integrity: sha512-P8kJBHmkqYHhojO97Tnj8FH+UInWzGBl2I9Z6ZX6sVUVW9/87hoovgCcVmvU1xMUD/xvKzX3m70fbRXhkocsGQ==} @@ -2444,41 +2408,32 @@ packages: '@typespec/compiler': ~0.59.0 dependencies: '@typespec/compiler': 0.59.0 - dev: true - - /@typespec/http/0.60.0_@typespec+compiler@0.60.0: - resolution: {integrity: sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==} - engines: {node: '>=18.0.0'} - peerDependencies: - '@typespec/compiler': ~0.60.0 - dependencies: - '@typespec/compiler': 0.60.0 - /@typespec/openapi/0.60.0_2kcgc74urgmxhgsn3mq2to6274: - resolution: {integrity: sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==} + /@typespec/openapi/0.59.0_kqkvcwi4aithpv7x2xgy7toc2q: + resolution: {integrity: sha512-do1Dm5w0MuK3994gYTBg6qMfgeIxmmsDqnz3zimYKMPpbnUBi4F6/o4iCfn0Fn9kaNl+H6UlOzZpsZW9xHui1Q==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 dependencies: - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - /@typespec/openapi3/0.60.0_jhug3akjzmkxswlgezkyvyot6u: - resolution: {integrity: sha512-gvrTHZACdeQtV7GfhVOHqkyTgMFyM2nKAIiz2P83LIncMCDUc00bGKGmaBk+xpuwKtCJyxBeVpCbID31YAq96g==} + /@typespec/openapi3/0.59.0_foc6rhrbx2on4sod3dtg7cmvwy: + resolution: {integrity: sha512-xwdWPPRtjsLxXjsebNppaHrFPF6rJiWkAEHCsK0elwvaPSruZvYfPhXpx1HnNkC2glb0NHgmxvXg7EmMwIYYcA==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - '@typespec/openapi': ~0.60.0 - '@typespec/versioning': ~0.60.0 + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/openapi': ~0.59.0 + '@typespec/versioning': ~0.59.0 dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 - '@typespec/openapi': 0.60.0_2kcgc74urgmxhgsn3mq2to6274 - '@typespec/versioning': 0.60.0_@typespec+compiler@0.60.0 + '@typespec/compiler': 0.59.0 + '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 yaml: 2.4.5 transitivePeerDependencies: - openapi-types @@ -2493,17 +2448,6 @@ packages: dependencies: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - dev: true - - /@typespec/rest/0.60.0_2kcgc74urgmxhgsn3mq2to6274: - resolution: {integrity: sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==} - engines: {node: '>=18.0.0'} - peerDependencies: - '@typespec/compiler': ~0.60.0 - '@typespec/http': ~0.60.0 - dependencies: - '@typespec/compiler': 0.60.0 - '@typespec/http': 0.60.0_@typespec+compiler@0.60.0 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2516,21 +2460,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.60.0_@typespec+compiler@0.60.0: - resolution: {integrity: sha512-SqxCQ9qMw5fdR7WP6/GFLzwcFwxhv+uHlzJGVcTd1GtIAu5qj2X4VmzFuNQyu+QenI+5uOSrEEywEXn0YRTZSg==} + /@typespec/versioning/0.59.0_@typespec+compiler@0.59.0: + resolution: {integrity: sha512-aihO/ux0lLmsuYAdGVkiBflSudcZokYG42SELk1FtMFo609G3Pd7ep7hau6unBnMIceQZejB0ow5UGRupK4X5A==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.60.0 + '@typespec/compiler': ~0.59.0 dependencies: - '@typespec/compiler': 0.60.0 + '@typespec/compiler': 0.59.0 - /@typespec/xml/0.59.0_@typespec+compiler@0.60.0: + /@typespec/xml/0.59.0_@typespec+compiler@0.59.0: resolution: {integrity: sha512-UoSsEmm7SXEtL9OXsqotu1TjruJSobqZMhUKAAlC9EP2WfQIHLRfBu7xaZB0sgwq7CM6zy/Hq1RZfQyL1KqEvg==} engines: {node: '>=18.0.0'} peerDependencies: '@typespec/compiler': ~0.59.0 dependencies: - '@typespec/compiler': 0.60.0 + '@typespec/compiler': 0.59.0 dev: true /@ungap/promise-all-settled/1.1.2: @@ -3552,7 +3496,7 @@ packages: vary: 1.1.2 dev: true - /cosmiconfig/9.0.0_typescript@5.5.3: + /cosmiconfig/9.0.0_typescript@5.6.2: resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} engines: {node: '>=14'} peerDependencies: @@ -3565,7 +3509,7 @@ packages: import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 - typescript: 5.5.3 + typescript: 5.6.2 dev: true /create-require/1.1.1: @@ -6733,14 +6677,14 @@ packages: - utf-8-validate dev: true - /puppeteer/22.4.1_typescript@5.5.3: + /puppeteer/22.4.1_typescript@5.6.2: resolution: {integrity: sha512-Mag1wRLanzwS4yEUyrDRBUgsKlH3dpL6oAfVwNHG09oxd0+ySsatMvYj7HwjynWy/S+Hg+XHLgjyC/F6CsL/lg==} engines: {node: '>=18'} hasBin: true requiresBuild: true dependencies: '@puppeteer/browsers': 2.1.0 - cosmiconfig: 9.0.0_typescript@5.5.3 + cosmiconfig: 9.0.0_typescript@5.6.2 puppeteer-core: 22.4.1 transitivePeerDependencies: - bufferutil @@ -7697,13 +7641,13 @@ packages: engines: {node: '>= 14.0.0'} dev: true - /ts-api-utils/1.0.3_typescript@5.5.3: + /ts-api-utils/1.0.3_typescript@5.6.2: resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.5.3 + typescript: 5.6.2 dev: true /ts-morph/23.0.0: @@ -7713,7 +7657,7 @@ packages: code-block-writer: 13.0.2 dev: false - /ts-node/10.9.1_zn7yththkfcgqhkmzzvsumdxyy: + /ts-node/10.9.1_jaxbkr345bnladzl3q4nioo63e: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -7739,12 +7683,12 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.5.3 + typescript: 5.6.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true - /ts-node/8.10.2_typescript@5.5.3: + /ts-node/8.10.2_typescript@5.6.2: resolution: {integrity: sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==} engines: {node: '>=6.0.0'} hasBin: true @@ -7755,7 +7699,7 @@ packages: diff: 4.0.2 make-error: 1.3.6 source-map-support: 0.5.21 - typescript: 5.5.3 + typescript: 5.6.2 yn: 3.1.1 dev: true @@ -7860,8 +7804,8 @@ packages: hasBin: true dev: true - /typescript/5.5.3: - resolution: {integrity: sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==} + /typescript/5.6.2: + resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} engines: {node: '>=14.17'} hasBin: true dev: true From fe14a87c742ef97764e4dd9199f6a334952b290d Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Fri, 20 Sep 2024 10:47:38 +0800 Subject: [PATCH 5/7] Upgrade to the latest and adopt breaking changes --- common/config/rush/pnpm-lock.yaml | 324 ++++++++++-------- .../typespec-ts/src/modular/buildCodeModel.ts | 2 +- .../typespec-ts/src/modular/emitSamples.ts | 14 +- .../typespec-ts/src/utils/credentialUtils.ts | 2 +- 4 files changed, 199 insertions(+), 143 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 84da7bfd40..31fa3355f5 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -191,34 +191,34 @@ importers: ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.33.0 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 - '@typespec/compiler': '>=0.59.0 <1.0.0' - '@typespec/http': '>=0.59.0 <1.0.0' - '@typespec/openapi': '>=0.59.0 <1.0.0' - '@typespec/openapi3': '>=0.59.0 <1.0.0' - '@typespec/rest': '>=0.59.0 <1.0.0' - '@typespec/versioning': '>=0.59.0 <1.0.0' + '@typespec/compiler': '>=0.60.0 <1.0.0' + '@typespec/http': '>=0.60.0 <1.0.0' + '@typespec/openapi': '>=0.60.0 <1.0.0' + '@typespec/openapi3': '>=0.60.0 <1.0.0' + '@typespec/rest': '>=0.60.0 <1.0.0' + '@typespec/versioning': '>=0.60.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 typescript: ~5.6.2 dependencies: - '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/typespec-autorest': 0.46.0_xbl575whnidfaer3avxvmhdt4m + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@azure-tools/typespec-azure-resource-manager': 0.46.0_mv2yjhxqzehxobn2ibqatea2lm + '@azure-tools/typespec-client-generator-core': 0.46.1_mv2yjhxqzehxobn2ibqatea2lm '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/openapi3': 0.59.0_foc6rhrbx2on4sod3dtg7cmvwy - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/openapi3': 0.60.0_ydlhixpxkgzi2wr3lviki266xe + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 @@ -234,10 +234,10 @@ importers: '@azure-tools/cadl-ranch-expect': ^0.15.3 '@azure-tools/cadl-ranch-specs': ^0.37.1 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.45.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.45.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.46.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.46.1 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 '@azure/core-lro': ^3.1.0 @@ -253,12 +253,12 @@ importers: '@types/node': ^18.0.0 '@typescript-eslint/eslint-plugin': ^6.8.0 '@typescript-eslint/parser': ^6.8.0 - '@typespec/compiler': '>=0.59.0 <1.0.0' - '@typespec/http': '>=0.59.0 <1.0.0' - '@typespec/openapi': '>=0.59.0, <1.0.0' - '@typespec/rest': '>=0.59.0 <1.0.0' + '@typespec/compiler': '>=0.60.0 <1.0.0' + '@typespec/http': '>=0.60.0 <1.0.0' + '@typespec/openapi': '>=0.60.0, <1.0.0' + '@typespec/rest': '>=0.60.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.59.0 <1.0.0' + '@typespec/versioning': '>=0.60.0 <1.0.0' '@vitest/coverage-istanbul': ~1.6.0 '@vitest/coverage-v8': ~1.6.0 chai: ^4.3.6 @@ -288,14 +288,14 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.1.0 - '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm + '@azure-tools/cadl-ranch': 0.14.5_u6vqycza47pc27npceq3afjroq '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu - '@azure-tools/cadl-ranch-specs': 0.37.1_rlqyi2csgeth45ysk6yolt4cci - '@azure-tools/typespec-autorest': 0.45.0_ch4e7dmaodljkmzs7h7dd2lznu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i + '@azure-tools/cadl-ranch-expect': 0.15.3_6q3mt4nixmc7532uwgfmj35l7a + '@azure-tools/cadl-ranch-specs': 0.37.1_uusjfipei5klyr7ukao6twze4y + '@azure-tools/typespec-autorest': 0.46.0_xbl575whnidfaer3avxvmhdt4m + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@azure-tools/typespec-azure-resource-manager': 0.46.0_mv2yjhxqzehxobn2ibqatea2lm + '@azure-tools/typespec-client-generator-core': 0.46.1_mv2yjhxqzehxobn2ibqatea2lm '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 '@azure/core-lro': 3.1.0 @@ -311,12 +311,12 @@ importers: '@types/node': 18.18.0 '@typescript-eslint/eslint-plugin': 6.8.0_wroavni7rd6ng5lxj6jm5p2pxq '@typescript-eslint/parser': 6.8.0_wgnkk2eh2432jxos7omdkkhhte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 '@vitest/coverage-istanbul': 1.6.0_vitest@1.6.0 '@vitest/coverage-v8': 1.6.0_vitest@1.6.0 chai: 4.3.8 @@ -440,7 +440,22 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.3_y3yxhtjg35d3g6m2dacugmsjfu: + /@azure-tools/cadl-ranch-expect/0.15.3_6q3mt4nixmc7532uwgfmj35l7a: + resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@typespec/compiler': ~0.59.0 + '@typespec/http': ~0.59.0 + '@typespec/rest': ~0.59.0 + '@typespec/versioning': ~0.59.0 + dependencies: + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 + dev: true + + /@azure-tools/cadl-ranch-expect/0.15.3_jjonmcwuf2jiombh5uzp35vkqe: resolution: {integrity: sha512-ulUf2aN9UznF71NMwqVjcvEOw3F5BlL1HqeTwHZl3ZgRs8x2+HRLE+lwIEjfQi6h1ISn9u3kr+wslB03uOaoIQ==} engines: {node: '>=16.0.0'} peerDependencies: @@ -452,10 +467,10 @@ packages: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 dev: true - /@azure-tools/cadl-ranch-specs/0.37.1_rlqyi2csgeth45ysk6yolt4cci: + /@azure-tools/cadl-ranch-specs/0.37.1_uusjfipei5klyr7ukao6twze4y: resolution: {integrity: sha512-XR8UxsbTQTSYbgyObcytRP0PLNWrU6cA8dTwQYh+VA/92HrSQYaJ8cQZZ/EyIFjFuSEVGQ74Rx6hpGvfKUrh2w==} engines: {node: '>=16.0.0'} peerDependencies: @@ -467,28 +482,28 @@ packages: '@typespec/versioning': ~0.59.0 '@typespec/xml': ~0.59.0 dependencies: - '@azure-tools/cadl-ranch': 0.14.5_e53zy5pp4bbrxbruosuhuay6sm + '@azure-tools/cadl-ranch': 0.14.5_u6vqycza47pc27npceq3afjroq '@azure-tools/cadl-ranch-api': 0.4.6 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/xml': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/cadl-ranch-expect': 0.15.3_6q3mt4nixmc7532uwgfmj35l7a + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 + '@typespec/xml': 0.59.0_@typespec+compiler@0.60.1 transitivePeerDependencies: - '@types/express' - supports-color dev: true - /@azure-tools/cadl-ranch/0.14.5_e53zy5pp4bbrxbruosuhuay6sm: + /@azure-tools/cadl-ranch/0.14.5_u6vqycza47pc27npceq3afjroq: resolution: {integrity: sha512-vF98b9ru49YvzcFnuSW6A/gpDOSZcTd/0S42XnmTyTVuF+fp3XOatXTvoUlKnQ25du8hZTm7JFzcZeOova7Xbw==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.4.6 '@azure-tools/cadl-ranch-coverage-sdk': 0.8.4 - '@azure-tools/cadl-ranch-expect': 0.15.3_y3yxhtjg35d3g6m2dacugmsjfu + '@azure-tools/cadl-ranch-expect': 0.15.3_jjonmcwuf2jiombh5uzp35vkqe '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 '@typespec/compiler': 0.59.0 @@ -542,77 +557,77 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.45.0_ch4e7dmaodljkmzs7h7dd2lznu: - resolution: {integrity: sha512-6ycZ0bEfXC0U26FHHEt9smAhxh78SACIDY+u7zLAopRzmxjTuthDdGgYSShuRDu3J+vEBi1fOKpz4cYQkgRkBQ==} + /@azure-tools/typespec-autorest/0.46.0_xbl575whnidfaer3avxvmhdt4m: + resolution: {integrity: sha512-LCIvxQgjczWUq/wi6fzKBqYHWJYD0hRLA8wBPzFasriHdBDHjpZ6vgTPmApzt0H5ArZX92Ar53Q5+ZXD9ktMUg==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@azure-tools/typespec-azure-resource-manager': ~0.45.0 - '@azure-tools/typespec-client-generator-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@azure-tools/typespec-azure-resource-manager': 0.45.0_rxzquxnvxkwebgrumlsfc6ni5i - '@azure-tools/typespec-client-generator-core': 0.45.4_rxzquxnvxkwebgrumlsfc6ni5i - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 - - /@azure-tools/typespec-azure-core/0.45.0_alrznhyrw66bvx6gp4zrtdfkte: - resolution: {integrity: sha512-GycGMCmaIVSN+TftPtlPJLyeOrglbLmH08ZiZaVMjSih/TQEJM21RGR6d8QdjlkQWN61ntNDRD+RP2uv9tHmqw==} + '@azure-tools/typespec-azure-core': ~0.46.0 + '@azure-tools/typespec-azure-resource-manager': ~0.46.0 + '@azure-tools/typespec-client-generator-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@azure-tools/typespec-azure-resource-manager': 0.46.0_mv2yjhxqzehxobn2ibqatea2lm + '@azure-tools/typespec-client-generator-core': 0.46.1_mv2yjhxqzehxobn2ibqatea2lm + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 + + /@azure-tools/typespec-azure-core/0.46.0_q5ggzbpl3hc67afymvxcd3rf4u: + resolution: {integrity: sha512-BNE31enSHWtWlrdIKShBS6CNFGk3OYmHSBnWqobcFJkTGXC090EoV2u6otn4BMI99fZRSR4gpwp/kYU9KLE9Jw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/rest': ~0.59.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/rest': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye - /@azure-tools/typespec-azure-resource-manager/0.45.0_rxzquxnvxkwebgrumlsfc6ni5i: - resolution: {integrity: sha512-PdhB03P8PoOlUoUWd+CF5WipGzu2Q3ZjT0EAzgQe878DmXvxMq+zYaPJQtvkq9R6jCxFauDSr5gG7Yd4NINAuA==} + /@azure-tools/typespec-azure-resource-manager/0.46.0_mv2yjhxqzehxobn2ibqatea2lm: + resolution: {integrity: sha512-ileS/0OMp0pmtWU3k0g2ZGfA957nOiEHtFJzAILsYYBFeBWgWuEuCPcKaGYScvlYTTK4Pyplpb7u00RBZBBObQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/typespec-azure-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.45.4_rxzquxnvxkwebgrumlsfc6ni5i: - resolution: {integrity: sha512-QJygwMqhEtBi2tPYs/HAfs0QTowXAwp6QpP/Vd2pHnJAncTV1BN17n/9LLAlMu2CnLimqvTuIN+FfliM28AX9w==} + /@azure-tools/typespec-client-generator-core/0.46.1_mv2yjhxqzehxobn2ibqatea2lm: + resolution: {integrity: sha512-mXA+ia5vS0yxPnxRW/vjKBJP5U4e4T5Gcr+GRjuS4+1gGolmklV2prJsXdR4iFLSVFfcH1zBFXQ2OPqsI5GMJw==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.45.0 - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/rest': ~0.59.0 - '@typespec/versioning': ~0.59.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.45.0_alrznhyrw66bvx6gp4zrtdfkte - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/rest': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@azure-tools/typespec-azure-core': ~0.46.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/rest': ~0.60.0 + '@typespec/versioning': ~0.60.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.46.0_q5ggzbpl3hc67afymvxcd3rf4u + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/rest': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 change-case: 5.4.4 pluralize: 8.0.0 @@ -2400,6 +2415,27 @@ packages: vscode-languageserver-textdocument: 1.0.11 yaml: 2.4.5 yargs: 17.7.2 + dev: true + + /@typespec/compiler/0.60.1: + resolution: {integrity: sha512-I6Vcpvd7mBP7SI5vCBh9rZGXAtVy95BKhAd33Enw32psswiSzRpA7zdyZhOMekTOGVXNS/+E5l2PGGCzQddB4w==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + '@babel/code-frame': 7.24.7 + ajv: 8.17.1 + change-case: 5.4.4 + globby: 14.0.2 + mustache: 4.2.0 + picocolors: 1.0.1 + prettier: 3.3.3 + prompts: 2.4.2 + semver: 7.6.3 + temporal-polyfill: 0.2.5 + vscode-languageserver: 9.0.1 + vscode-languageserver-textdocument: 1.0.11 + yaml: 2.4.5 + yargs: 17.7.2 /@typespec/http/0.59.0_@typespec+compiler@0.59.0: resolution: {integrity: sha512-P8kJBHmkqYHhojO97Tnj8FH+UInWzGBl2I9Z6ZX6sVUVW9/87hoovgCcVmvU1xMUD/xvKzX3m70fbRXhkocsGQ==} @@ -2408,32 +2444,41 @@ packages: '@typespec/compiler': ~0.59.0 dependencies: '@typespec/compiler': 0.59.0 + dev: true - /@typespec/openapi/0.59.0_kqkvcwi4aithpv7x2xgy7toc2q: - resolution: {integrity: sha512-do1Dm5w0MuK3994gYTBg6qMfgeIxmmsDqnz3zimYKMPpbnUBi4F6/o4iCfn0Fn9kaNl+H6UlOzZpsZW9xHui1Q==} + /@typespec/http/0.60.0_@typespec+compiler@0.60.1: + resolution: {integrity: sha512-ktfS9vpHfltyeAaQLNAZdqrn6Per3vmB/HDH/iyudYLA5wWblT1siKvpFCMWq53CJorRO7yeOKv+Q/M26zwEtg==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 + '@typespec/compiler': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.1 - /@typespec/openapi3/0.59.0_foc6rhrbx2on4sod3dtg7cmvwy: - resolution: {integrity: sha512-xwdWPPRtjsLxXjsebNppaHrFPF6rJiWkAEHCsK0elwvaPSruZvYfPhXpx1HnNkC2glb0NHgmxvXg7EmMwIYYcA==} + /@typespec/openapi/0.60.0_yqm75b3axjref3ollnyxtv2cye: + resolution: {integrity: sha512-YVwLppgHY8r/MudHNSLSUXzdw+CIpjmb31gI2a0KDGnI6sWDwY7LSWfjGU4TY/ubt0+X0Tjoy330mTvw71YBTg==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + dependencies: + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + + /@typespec/openapi3/0.60.0_ydlhixpxkgzi2wr3lviki266xe: + resolution: {integrity: sha512-gvrTHZACdeQtV7GfhVOHqkyTgMFyM2nKAIiz2P83LIncMCDUc00bGKGmaBk+xpuwKtCJyxBeVpCbID31YAq96g==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.59.0 - '@typespec/http': ~0.59.0 - '@typespec/openapi': ~0.59.0 - '@typespec/versioning': ~0.59.0 + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + '@typespec/openapi': ~0.60.0 + '@typespec/versioning': ~0.60.0 dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.59.0 - '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 - '@typespec/openapi': 0.59.0_kqkvcwi4aithpv7x2xgy7toc2q - '@typespec/versioning': 0.59.0_@typespec+compiler@0.59.0 + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 + '@typespec/openapi': 0.60.0_yqm75b3axjref3ollnyxtv2cye + '@typespec/versioning': 0.60.1_@typespec+compiler@0.60.1 yaml: 2.4.5 transitivePeerDependencies: - openapi-types @@ -2448,6 +2493,17 @@ packages: dependencies: '@typespec/compiler': 0.59.0 '@typespec/http': 0.59.0_@typespec+compiler@0.59.0 + dev: true + + /@typespec/rest/0.60.0_yqm75b3axjref3ollnyxtv2cye: + resolution: {integrity: sha512-mHYubyuBvwdV2xkHrJfPwV7b/Ksyb9lA1Q/AQwpVFa7Qu1X075TBVALmH+hK3V0EdUG1CGJZ5Sw4BWgl8ZS0BA==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.60.0 + '@typespec/http': ~0.60.0 + dependencies: + '@typespec/compiler': 0.60.1 + '@typespec/http': 0.60.0_@typespec+compiler@0.60.1 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2460,21 +2516,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.59.0_@typespec+compiler@0.59.0: - resolution: {integrity: sha512-aihO/ux0lLmsuYAdGVkiBflSudcZokYG42SELk1FtMFo609G3Pd7ep7hau6unBnMIceQZejB0ow5UGRupK4X5A==} + /@typespec/versioning/0.60.1_@typespec+compiler@0.60.1: + resolution: {integrity: sha512-HogYL7P9uOPoSvkLLDjF22S6E9td6EY3c6TcIHhCzDTAQoi54csikD0gNrtcCkFG0UeQk29HgQymV397j+vp4g==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.59.0 + '@typespec/compiler': ~0.60.0 dependencies: - '@typespec/compiler': 0.59.0 + '@typespec/compiler': 0.60.1 - /@typespec/xml/0.59.0_@typespec+compiler@0.59.0: + /@typespec/xml/0.59.0_@typespec+compiler@0.60.1: resolution: {integrity: sha512-UoSsEmm7SXEtL9OXsqotu1TjruJSobqZMhUKAAlC9EP2WfQIHLRfBu7xaZB0sgwq7CM6zy/Hq1RZfQyL1KqEvg==} engines: {node: '>=18.0.0'} peerDependencies: '@typespec/compiler': ~0.59.0 dependencies: - '@typespec/compiler': 0.59.0 + '@typespec/compiler': 0.60.1 dev: true /@ungap/promise-all-settled/1.1.2: diff --git a/packages/typespec-ts/src/modular/buildCodeModel.ts b/packages/typespec-ts/src/modular/buildCodeModel.ts index 2c65d604c8..9582687c87 100644 --- a/packages/typespec-ts/src/modular/buildCodeModel.ts +++ b/packages/typespec-ts/src/modular/buildCodeModel.ts @@ -1412,7 +1412,7 @@ function emitUnion( : type.name; const discriminatorPropertyName = getDiscriminator(context.program, type) ?.propertyName; - const variantTypes = sdkType.values.map((x) => { + const variantTypes = sdkType.variantTypes.map((x) => { const valueType = getType(context, x.__raw!, { usage }); if (valueType.properties && discriminatorPropertyName) { valueType.discriminatorValue = valueType.properties.filter( diff --git a/packages/typespec-ts/src/modular/emitSamples.ts b/packages/typespec-ts/src/modular/emitSamples.ts index 4149093044..0aee43a5ef 100644 --- a/packages/typespec-ts/src/modular/emitSamples.ts +++ b/packages/typespec-ts/src/modular/emitSamples.ts @@ -8,11 +8,11 @@ import { SdkContext } from "../utils/interfaces.js"; import { SdkClientType, SdkHttpOperationExample, - SdkHttpParameterExample, + SdkHttpParameterExampleValue, SdkInitializationType, SdkServiceMethod, SdkServiceOperation, - SdkTypeExample + SdkExampleValue } from "@azure-tools/typespec-client-generator-core"; import { isAzurePackage, @@ -148,7 +148,7 @@ function emitMethodSamples( returnType: "void", body: exampleFunctionBody }; - const parameterMap: Record = + const parameterMap: Record = buildParameterValueMap(example); const parameters = prepareExampleParameters( dpgContext, @@ -240,7 +240,7 @@ function emitMethodSamples( } function buildParameterValueMap(example: SdkHttpOperationExample) { - const parameterMap: Record = {}; + const parameterMap: Record = {}; example.parameters.forEach( (param) => (parameterMap[ @@ -253,7 +253,7 @@ function buildParameterValueMap(example: SdkHttpOperationExample) { function prepareExampleParameters( dpgContext: SdkContext, method: SdkServiceMethod, - parameterMap: Record, + parameterMap: Record, topLevelClient: SdkClientType ): ExampleValue[] { // TODO: blocked by TCGC issue: https://github.com/Azure/typespec-azure/issues/1419 @@ -399,7 +399,7 @@ function getCredentialExampleValue( return undefined; } -function getParameterValue(value: SdkTypeExample): string { +function getParameterValue(value: SdkExampleValue): string { let retValue = `{} as any`; switch (value.kind) { case "string": { @@ -416,7 +416,7 @@ function getParameterValue(value: SdkTypeExample): string { case "boolean": case "number": case "null": - case "any": + case "unknown": case "union": retValue = `${value.value}`; break; diff --git a/packages/typespec-ts/src/utils/credentialUtils.ts b/packages/typespec-ts/src/utils/credentialUtils.ts index 865604f852..2eaef00f53 100644 --- a/packages/typespec-ts/src/utils/credentialUtils.ts +++ b/packages/typespec-ts/src/utils/credentialUtils.ts @@ -73,7 +73,7 @@ function getAuthScheme(initialization: SdkInitializationType): HttpAuth[] { if (kind === "credential") { authScheme.push(credentialParams.type.scheme); } else if (kind === "union") { - for (const param of credentialParams.type.values) { + for (const param of credentialParams.type.variantTypes) { authScheme.push(param.scheme); } } From 98a99482fa3e71c1e6b4e4081df8459c2e8ffd33 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Fri, 20 Sep 2024 11:00:46 +0800 Subject: [PATCH 6/7] Fix the uts --- packages/typespec-ts/src/modular/emitSamples.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/typespec-ts/src/modular/emitSamples.ts b/packages/typespec-ts/src/modular/emitSamples.ts index 0aee43a5ef..40011f3e27 100644 --- a/packages/typespec-ts/src/modular/emitSamples.ts +++ b/packages/typespec-ts/src/modular/emitSamples.ts @@ -270,7 +270,11 @@ function prepareExampleParameters( let subscriptionIdValue = `"00000000-0000-0000-0000-00000000000"`; // required parameters for (const param of method.operation.parameters) { - if (param.optional === true || param.type.kind === "constant") { + if ( + param.optional === true || + param.type.kind === "constant" || + param.clientDefaultValue + ) { continue; } @@ -346,7 +350,10 @@ function prepareExampleParameters( // optional parameters method.operation.parameters .filter( - (param) => param.optional === true && parameterMap[param.serializedName] + (param) => + param.optional === true && + parameterMap[param.serializedName] && + !param.clientDefaultValue ) .map((param) => parameterMap[param.serializedName]!) .forEach((param) => { From fd31197af5fdc9d0eec6e73d76d9c1aff0f178c9 Mon Sep 17 00:00:00 2001 From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com> Date: Fri, 20 Sep 2024 11:26:23 +0800 Subject: [PATCH 7/7] fix ci --- .../typespec-ts/review/ai-anomaly-detector.api.md | 6 ++++++ .../anomalyDetector/generated/typespec-ts/src/index.ts | 1 + .../generated/typespec-ts/src/models/index.ts | 1 + .../generated/typespec-ts/src/models/models.ts | 8 ++++++++ 4 files changed, 16 insertions(+) diff --git a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/review/ai-anomaly-detector.api.md b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/review/ai-anomaly-detector.api.md index d160087fb8..bb11ba69e9 100644 --- a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/review/ai-anomaly-detector.api.md +++ b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/review/ai-anomaly-detector.api.md @@ -196,6 +196,12 @@ export interface MultivariateOperations { trainMultivariateModel: (modelInfo: MultivariateModelInfo, options?: MultivariateTrainMultivariateModelOptionalParams) => Promise; } +// @public +export interface MultivariateResponseError { + code: string; + message: string; +} + // @public export interface MultivariateTrainMultivariateModelOptionalParams extends OperationOptions { } diff --git a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/index.ts b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/index.ts index 1110b67f02..aaf6de5994 100644 --- a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/index.ts +++ b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/index.ts @@ -45,6 +45,7 @@ export { UnivariateUnivariateChangePointDetectionOptions, UnivariateUnivariateChangePointDetectionResult, Versions, + MultivariateResponseError, UnivariateDetectUnivariateEntireSeriesOptionalParams, UnivariateDetectUnivariateLastPointOptionalParams, UnivariateDetectUnivariateChangePointOptionalParams, diff --git a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/index.ts b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/index.ts index c997bee35e..341fc92793 100644 --- a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/index.ts +++ b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/index.ts @@ -35,6 +35,7 @@ export { UnivariateUnivariateChangePointDetectionOptions, UnivariateUnivariateChangePointDetectionResult, Versions, + MultivariateResponseError, } from "./models.js"; export { UnivariateDetectUnivariateEntireSeriesOptionalParams, diff --git a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/models.ts b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/models.ts index 1928a7f372..a885e02e69 100644 --- a/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/models.ts +++ b/packages/typespec-test/test/anomalyDetector/generated/typespec-ts/src/models/models.ts @@ -687,3 +687,11 @@ export interface UnivariateUnivariateChangePointDetectionResult { /** Type of Versions */ export type Versions = "v1.1"; + +/** Error response */ +export interface MultivariateResponseError { + /** The error code. */ + code: string; + /** The message explaining the error reported by the service. */ + message: string; +}