From 3f595fb9d32e3332e1750e7022c782b7d4dc2bcd Mon Sep 17 00:00:00 2001 From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:51:17 +0800 Subject: [PATCH 01/16] upgrade tcgc cadl-ranch and compiler to latest --- common/config/rush/pnpm-lock.yaml | 404 ++++++++++++++-------------- packages/typespec-test/package.json | 20 +- packages/typespec-ts/package.json | 36 +-- 3 files changed, 232 insertions(+), 228 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 770a9d1f84..134e1a331f 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.47.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.47.1 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.48.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.61.2 <1.0.0' - '@typespec/http': '>=0.61.0 <1.0.0' - '@typespec/openapi': '>=0.61.0 <1.0.0' - '@typespec/openapi3': '>=0.61.0 <1.0.0' - '@typespec/rest': '>=0.61.0 <1.0.0' - '@typespec/versioning': '>=0.61.0 <1.0.0' + '@typespec/compiler': '>=0.62.0 <1.0.0' + '@typespec/http': '>=0.62.0 <1.0.0' + '@typespec/openapi': '>=0.62.0 <1.0.0' + '@typespec/openapi3': '>=0.62.0 <1.0.0' + '@typespec/rest': '>=0.62.0 <1.0.0' + '@typespec/versioning': '>=0.62.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 typescript: ~5.6.2 dependencies: - '@azure-tools/typespec-autorest': 0.47.0_6i46vjalqozm5ewev2ynb2kyea - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.1_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-autorest': 0.48.0_k3ixffjro63fkoc7q7z6mrfsdq + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/openapi3': 0.61.0_55ilrakjwebv5frpjugw2fujmu - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/openapi3': 0.62.0_w4ienkqkqg3jsox2pddtpe4f5m + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 @@ -229,15 +229,15 @@ importers: ../../packages/typespec-ts: specifiers: '@azure-rest/core-client': ^2.3.1 - '@azure-tools/cadl-ranch': ^0.15.0 + '@azure-tools/cadl-ranch': ^0.16.1 '@azure-tools/cadl-ranch-api': ^0.5.0 - '@azure-tools/cadl-ranch-expect': ^0.15.5 - '@azure-tools/cadl-ranch-specs': ^0.38.0 + '@azure-tools/cadl-ranch-expect': ^0.15.6 + '@azure-tools/cadl-ranch-specs': ^0.39.1 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.47.1 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.48.0 <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.61.2 <1.0.0' - '@typespec/http': '>=0.61.0 <1.0.0' - '@typespec/openapi': '>=0.61.0, <1.0.0' - '@typespec/rest': '>=0.61.0 <1.0.0' + '@typespec/compiler': '>=0.62.0 <1.0.0' + '@typespec/http': '>=0.62.0 <1.0.0' + '@typespec/openapi': '>=0.62.0, <1.0.0' + '@typespec/rest': '>=0.62.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.61.0 <1.0.0' + '@typespec/versioning': '>=0.62.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.3.1 - '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 + '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi - '@azure-tools/cadl-ranch-specs': 0.38.0_ouo3nkt6333nzbxz2spj76mz74 - '@azure-tools/typespec-autorest': 0.47.0_6i46vjalqozm5ewev2ynb2kyea - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.1_f62ldmasulsabis4qbnzkqboii + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y + '@azure-tools/cadl-ranch-specs': 0.39.1_fm5bpb4bfczzprftnu3bq22rpm + '@azure-tools/typespec-autorest': 0.48.0_k3ixffjro63fkoc7q7z6mrfsdq + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku '@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.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.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,42 +440,42 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.5_str2psid7izwllhra2ow6hs7pi: - resolution: {integrity: sha512-7tr/FIDeFCJnDjEQ7J/A2MKmnmYrJBlTS7y9XjsWpJLC/fpB3lyvDvVYlsFmeO5dmnRc3+B4eEoWgWx46r3auA==} + /@azure-tools/cadl-ranch-expect/0.15.6_f5giq3reeireto67b6daw62k5y: + resolution: {integrity: sha512-t601oyRwiSy/Nbbro5A7OHZSKsVGxGRJMPnd4X80dYetTBinUHXS2+cVx+fVQlUmb/4Ru/qNOvG0jtTJY9/XHw==} engines: {node: '>=16.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 dev: true - /@azure-tools/cadl-ranch-specs/0.38.0_ouo3nkt6333nzbxz2spj76mz74: - resolution: {integrity: sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==} + /@azure-tools/cadl-ranch-specs/0.39.1_fm5bpb4bfczzprftnu3bq22rpm: + resolution: {integrity: sha512-eZy1fHt9wVFQ4aHTEz9zCKW2vFk34mN3tB3Qbuk9tZMaD62FSHVO0PkawOTFuxOlhavRkd7sw2W2nihWIVVqeQ==} engines: {node: '>=16.0.0'} peerDependencies: - '@azure-tools/cadl-ranch-expect': ~0.15.5 - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - '@typespec/xml': ~0.61.0 - dependencies: - '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 + '@azure-tools/cadl-ranch-expect': ~0.15.6 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + '@typespec/xml': ~0.62.0 + dependencies: + '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/xml': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/xml': 0.62.0_@typespec+compiler@0.62.0 transitivePeerDependencies: - '@types/express' - '@typespec/streams' @@ -483,19 +483,19 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch/0.15.0_d4yylgqtsey5a7wubqjw5gjsq4: - resolution: {integrity: sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==} + /@azure-tools/cadl-ranch/0.16.1_maorf56vredk4k7ivyf3kw4p7i: + resolution: {integrity: sha512-4tyd+2GDsZjkcsiB14T2m5imkPCokJkFLKrPe0mINb5Z6DVVzk/2BkhId//zk9KinpYL0ThG9ewM1ZeJ0jnoeg==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-coverage-sdk': 0.9.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe ajv: 8.17.1 axios: 1.7.7 body-parser: 1.20.3 @@ -548,77 +548,77 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.47.0_6i46vjalqozm5ewev2ynb2kyea: - resolution: {integrity: sha512-uYkk8mnzekSMhJKU3RS0cXvKPH0vbkonthYoPe7/vxZ7tWv4xJLSglV2v3m3QElFgvNebNVoBOEWSY8Kz/ip2Q==} + /@azure-tools/typespec-autorest/0.48.0_k3ixffjro63fkoc7q7z6mrfsdq: + resolution: {integrity: sha512-AyoNMq3EORugHynFF8bN0TJh+zYxui/ApU5DoVEL7Xr1yMD6k9p5b90VD4HiCsP0dz8470ApFnjt5Vl6xCSzig==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@azure-tools/typespec-azure-resource-manager': ~0.47.0 - '@azure-tools/typespec-client-generator-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.1_f62ldmasulsabis4qbnzkqboii - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 - - /@azure-tools/typespec-azure-core/0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy: - resolution: {integrity: sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==} + '@azure-tools/typespec-azure-core': ~0.48.0 + '@azure-tools/typespec-azure-resource-manager': ~0.48.0 + '@azure-tools/typespec-client-generator-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + + /@azure-tools/typespec-azure-core/0.48.0_aaegv3jydxpwng7gbukr25tg2m: + resolution: {integrity: sha512-80qyqgTgBbrnCGXtz6eWAMBdEAjYVVL780L0Ye+rBEd6VoA0m3JrgzUqf5bC0Iwju6lEtBAb8o6sefKD/NGA7g==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - /@azure-tools/typespec-azure-resource-manager/0.47.0_f62ldmasulsabis4qbnzkqboii: - resolution: {integrity: sha512-pe9XhHJezTZtVlSVKIMhL1kRATMg6QSaXUZQhQmQKSuozVRsRBxI4IAhK3RU4p6SA8A2CoCpPeJpRhQTvdt73Q==} + /@azure-tools/typespec-azure-resource-manager/0.48.0_xptzwysxh7uiycxgwx225suwku: + resolution: {integrity: sha512-4JxPbKxd3EJ98sLbtfBlqyANWVrU6tT2nk3iLspg7MITPLhiMTeRT9BprsJXH18ks8qw8scR7/am5r57YERTmQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.47.1_f62ldmasulsabis4qbnzkqboii: - resolution: {integrity: sha512-kgjGnnOaHewa8PjmZcEY4+UrEMBrXhOpMxDuhlMnFfOvCo3uZc3FVryoNrDHkZ8weCn6sjxo8zHcj1lpCg4/uw==} + /@azure-tools/typespec-client-generator-core/0.48.0_xptzwysxh7uiycxgwx225suwku: + resolution: {integrity: sha512-+fmKjapz0kP7ONPZap8dgcIKIdQw+YBSrf89csbIyhPTcLnVAk/BKljo8FoNypKXwqKHenslLm0njBKPllkopg==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 change-case: 5.4.4 pluralize: 8.0.0 @@ -882,11 +882,11 @@ packages: - supports-color dev: true - /@babel/code-frame/7.24.7: - resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} + /@babel/code-frame/7.25.9: + resolution: {integrity: sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.24.7 + '@babel/highlight': 7.25.9 picocolors: 1.1.0 /@babel/compat-data/7.24.7: @@ -899,7 +899,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/generator': 7.24.7 '@babel/helper-compilation-targets': 7.24.7 '@babel/helper-module-transforms': 7.24.7_@babel+core@7.24.7 @@ -981,7 +981,7 @@ packages: '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 transitivePeerDependencies: - supports-color dev: true @@ -1008,8 +1008,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier/7.24.7: - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + /@babel/helper-validator-identifier/7.25.9: + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} /@babel/helper-validator-option/7.24.7: @@ -1025,11 +1025,11 @@ packages: '@babel/types': 7.24.7 dev: true - /@babel/highlight/7.24.7: - resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} + /@babel/highlight/7.25.9: + resolution: {integrity: sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.0 @@ -1051,7 +1051,7 @@ packages: resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/parser': 7.24.7 '@babel/types': 7.24.7 dev: true @@ -1060,7 +1060,7 @@ packages: resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/generator': 7.24.7 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 @@ -1079,7 +1079,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 to-fast-properties: 2.0.0 dev: true @@ -1800,7 +1800,7 @@ packages: peerDependencies: ajv: 4.11.8 - 8 dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/runtime': 7.24.8 '@humanwhocodes/momoa': 2.0.4 ajv: 8.17.1 @@ -2385,12 +2385,12 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typespec/compiler/0.61.2: - resolution: {integrity: sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==} + /@typespec/compiler/0.62.0: + resolution: {integrity: sha512-RfKJ/rF2Wjxu7dl74oJE8yEfSkeL7NopFlyJ4dW1JQXpRN2IOJYPxas12qZA6H9ZEIB8rBjyrHNxJSQbvn/UDQ==} engines: {node: '>=18.0.0'} hasBin: true dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 ajv: 8.17.1 change-case: 5.4.4 globby: 14.0.2 @@ -2405,57 +2405,61 @@ packages: yaml: 2.5.1 yargs: 17.7.2 - /@typespec/http/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==} + /@typespec/http/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-6H9y9e32lb2s76MMy29ITCwSZNG42sa/qWthiByUvfbTEXMpu5a1fQHNj7RXg+xmDKmVIHv3gAfjGPAWfXhkaQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/streams': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/streams': ~0.62.0 peerDependenciesMeta: '@typespec/streams': optional: true dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 - /@typespec/openapi/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: - resolution: {integrity: sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==} + /@typespec/openapi/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: + resolution: {integrity: sha512-Xtm0Nd2BuSmEfSWGtc10ok22jyomYm9L2jY+kVTy+v5J89DrVh0o6+YpipUl1QhcItM1YMBphWHIHPfwkDRbnw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - /@typespec/openapi3/0.61.0_55ilrakjwebv5frpjugw2fujmu: - resolution: {integrity: sha512-ALLsTkK1UiJBzvygV1Zk/yZaym+lOWroGeEUhQNXYShsq+/GLZkK0rl8sd76Gigq+TVXKMOEwUUvgfws/LMUJw==} + /@typespec/openapi3/0.62.0_w4ienkqkqg3jsox2pddtpe4f5m: + resolution: {integrity: sha512-tfmaPvZ38fM+O5+ZBq4ic7fc32E3v0JOFP9h+7otQyrVprLVCToXpBwaxB7c2nTSJbI4vcxK7/T3Z8BD5j8X+w==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/versioning': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/versioning': ~0.62.0 + '@typespec/xml': '*' + peerDependenciesMeta: + '@typespec/xml': + optional: true dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 yaml: 2.5.1 transitivePeerDependencies: - openapi-types dev: false - /@typespec/rest/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: - resolution: {integrity: sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==} + /@typespec/rest/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: + resolution: {integrity: sha512-ci5UjelEKFwsPTdpgysoUoDCcw02EnbG4GBuYJdR5mRrFCBZMxrbro+OJLgSN3g/TORSsWlW7dEOWLfbyrmlZQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2468,21 +2472,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==} + /@typespec/versioning/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-M5KTCVH5fBniZU8eQlw+NV13vAmPr58HyBLDIyxeOuV+SHNlx+f+qanUEDIPaJheKlaSSNTEZKsDhs83/iIMMA==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 + '@typespec/compiler': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 - /@typespec/xml/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-LnMYyzB7f6C8rBZmQwhKyJOJ8mUTFls6aVKXw4EAaO2+HPsm73GN16lj1bt2ffbWR3izCGnz911K2wGtUrtSpA==} + /@typespec/xml/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-DexGTQHB75fncDcYfs5CIbNwO6NOhjwCaaNoHYAsVVzs4T8qwzw6WQdEEMzZRbgsxwnllFkxKwGhLtRMQdv/cQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 + '@typespec/compiler': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 dev: true /@ungap/promise-all-settled/1.1.2: @@ -3713,7 +3717,7 @@ packages: dependencies: get-intrinsic: 1.2.4 gopd: 1.0.1 - has-property-descriptors: 1.0.0 + has-property-descriptors: 1.0.2 dev: true /define-data-property/1.1.4: @@ -3945,16 +3949,16 @@ packages: array-buffer-byte-length: 1.0.0 arraybuffer.prototype.slice: 1.0.2 available-typed-arrays: 1.0.5 - call-bind: 1.0.2 + call-bind: 1.0.7 es-set-tostringtag: 2.0.1 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.1 + get-intrinsic: 1.2.4 get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 has: 1.0.3 - has-property-descriptors: 1.0.0 + has-property-descriptors: 1.0.2 has-proto: 1.0.1 has-symbols: 1.0.3 internal-slot: 1.0.5 @@ -3966,7 +3970,7 @@ packages: is-string: 1.0.7 is-typed-array: 1.1.12 is-weakref: 1.0.2 - object-inspect: 1.12.3 + object-inspect: 1.13.2 object-keys: 1.1.1 object.assign: 4.1.4 regexp.prototype.flags: 1.5.1 @@ -5008,7 +5012,7 @@ packages: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} dependencies: - function-bind: 1.1.1 + function-bind: 1.1.2 dev: true /hasown/2.0.2: @@ -5409,8 +5413,8 @@ packages: /is-weakset/2.0.2: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: - call-bind: 1.0.2 - get-intrinsic: 1.2.1 + call-bind: 1.0.7 + get-intrinsic: 1.2.4 dev: true /is-wsl/2.2.0: @@ -6559,7 +6563,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -6853,7 +6857,7 @@ packages: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} engines: {node: '>=0.6'} dependencies: - side-channel: 1.0.4 + side-channel: 1.0.6 dev: true /qs/6.13.0: @@ -7280,9 +7284,9 @@ packages: resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.0 + define-data-property: 1.1.4 functions-have-names: 1.2.3 - has-property-descriptors: 1.0.0 + has-property-descriptors: 1.0.2 dev: true /setprototypeof/1.2.0: diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index 77f8bf9bff..e62899bb4c 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.61.0 <1.0.0", - "@azure-tools/typespec-autorest": ">=0.47.0 <1.0.0", - "@typespec/openapi3": ">=0.61.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.47.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.47.1 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.47.0 <1.0.0", - "@typespec/compiler": ">=0.61.2 <1.0.0", - "@typespec/http": ">=0.61.0 <1.0.0", - "@typespec/rest": ">=0.61.0 <1.0.0", - "@typespec/versioning": ">=0.61.0 <1.0.0", + "@typespec/openapi": ">=0.62.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0", + "@typespec/openapi3": ">=0.62.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0", + "@typespec/compiler": ">=0.62.0 <1.0.0", + "@typespec/http": ">=0.62.0 <1.0.0", + "@typespec/rest": ">=0.62.0 <1.0.0", + "@typespec/versioning": ">=0.62.0 <1.0.0", "prettier": "^3.1.0" }, "devDependencies": { diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index f4d3f5bb04..73531d4098 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -63,14 +63,14 @@ "license": "MIT", "devDependencies": { "@azure-rest/core-client": "^2.3.1", - "@azure-tools/cadl-ranch-expect": "^0.15.5", - "@azure-tools/cadl-ranch-specs": "^0.38.0", - "@azure-tools/cadl-ranch": "^0.15.0", + "@azure-tools/cadl-ranch-expect": "^0.15.6", + "@azure-tools/cadl-ranch-specs": "^0.39.1", + "@azure-tools/cadl-ranch": "^0.16.1", "@azure-tools/cadl-ranch-api": "^0.5.0", - "@azure-tools/typespec-autorest": ">=0.47.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.47.0 <1.0.0", - "@azure-tools/typespec-azure-resource-manager": ">=0.47.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.47.1 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.48.0 <1.0.0", "@azure/abort-controller": "^2.1.2", "@azure/core-auth": "^1.6.0", "@azure/core-lro": "^3.1.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.61.2 <1.0.0", - "@typespec/http": ">=0.61.0 <1.0.0", - "@typespec/openapi": ">=0.61.0, <1.0.0", - "@typespec/rest": ">=0.61.0 <1.0.0", + "@typespec/compiler": ">=0.62.0 <1.0.0", + "@typespec/http": ">=0.62.0 <1.0.0", + "@typespec/openapi": ">=0.62.0, <1.0.0", + "@typespec/rest": ">=0.62.0 <1.0.0", "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2", - "@typespec/versioning": ">=0.61.0 <1.0.0", + "@typespec/versioning": ">=0.62.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.47.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.47.1 <1.0.0", - "@typespec/compiler": ">=0.61.2 <1.0.0", - "@typespec/http": ">=0.61.0 <1.0.0", - "@typespec/rest": ">=0.61.0 <1.0.0", - "@typespec/versioning": ">=0.61.0 <1.0.0" + "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.48.0 <1.0.0", + "@typespec/compiler": ">=0.62.0 <1.0.0", + "@typespec/http": ">=0.62.0 <1.0.0", + "@typespec/rest": ">=0.62.0 <1.0.0", + "@typespec/versioning": ">=0.62.0 <1.0.0" }, "dependencies": { "@azure-tools/rlc-common": "workspace:^0.33.0", From 14f5f8d49948899155ac4682d31372f81a625f02 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:06:55 +0800 Subject: [PATCH 02/16] Fix the build issue for upgrading --- packages/typespec-ts/src/lib.ts | 6 ++++++ .../typespec-ts/src/modular/buildCodeModel.ts | 19 ++++++++++++++++++- .../src/transform/transformApiVersionInfo.ts | 4 ++-- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packages/typespec-ts/src/lib.ts b/packages/typespec-ts/src/lib.ts index 74151295ba..8a6b1285ce 100644 --- a/packages/typespec-ts/src/lib.ts +++ b/packages/typespec-ts/src/lib.ts @@ -267,6 +267,12 @@ const libDef = { messages: { default: paramMessage`Path parameter '${"paramName"}' cannot be optional.` } + }, + "parameter-type-not-supported": { + severity: "warning", + messages: { + default: paramMessage`Parameter '${"paramName"}' with type '${"paramType"}' is not supported and we would ignore this parameter.` + } } }, emitter: { diff --git a/packages/typespec-ts/src/modular/buildCodeModel.ts b/packages/typespec-ts/src/modular/buildCodeModel.ts index 38f7a39398..ceb03de35a 100644 --- a/packages/typespec-ts/src/modular/buildCodeModel.ts +++ b/packages/typespec-ts/src/modular/buildCodeModel.ts @@ -510,7 +510,18 @@ function emitParameter( context: SdkContext, parameter: HttpOperationParameter | HttpServerParameter, implementation: string -): Parameter { +): Parameter | undefined { + if (parameter.type === "cookie") { + reportDiagnostic(context.program, { + code: "parameter-type-not-supported", + format: { + paramType: parameter.type, + paramName: parameter.name + }, + target: NoTarget + }); + return undefined; + } const base = emitParamBase(context, parameter.param); let type = getType(context, parameter.param.type, { usage: UsageFlags.Input @@ -851,6 +862,9 @@ function emitBasicOperation( continue; } const emittedParam = emitParameter(context, param, "Method"); + if (emittedParam === undefined) { + continue; + } if (isApiVersion(context, param)) { emittedParam.isApiVersion = true; methodApiVersionParam = emittedParam; @@ -1713,6 +1727,9 @@ function emitServerParams( serverParameter, "Client" ); + if (emittedParameter === undefined) { + continue; + } endpointPathParameters.push(emittedParameter); if (isApiVersion(context, serverParameter as any)) { emittedParameter.isApiVersion = true; diff --git a/packages/typespec-ts/src/transform/transformApiVersionInfo.ts b/packages/typespec-ts/src/transform/transformApiVersionInfo.ts index 6bf7ed451a..6bbe08bb9f 100644 --- a/packages/typespec-ts/src/transform/transformApiVersionInfo.ts +++ b/packages/typespec-ts/src/transform/transformApiVersionInfo.ts @@ -86,7 +86,7 @@ export function getOperationApiVersion( relevantProperty: p.param }); required.add(!p.param.optional); - if (p.type !== "header") { + if (p.type === "query" || p.type === "path") { locations.add(p.type); } const typeString = JSON.stringify(trimUsage(type)); @@ -127,7 +127,7 @@ export function getOperationApiVersion( relevantProperty: p.param }); required.add(!p.param.optional); - if (p.type !== "header") { + if (p.type === "query" || p.type === "path") { locations.add(p.type); } const typeString = JSON.stringify(trimUsage(type)); From 961931054f515e040cf1d1fe1ad178b4125bf6e8 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:13:09 +0800 Subject: [PATCH 03/16] Report warnings for cookie parameter in RLC --- .../src/transform/transformParameters.ts | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/typespec-ts/src/transform/transformParameters.ts b/packages/typespec-ts/src/transform/transformParameters.ts index 1541a290db..1f1064d91d 100644 --- a/packages/typespec-ts/src/transform/transformParameters.ts +++ b/packages/typespec-ts/src/transform/transformParameters.ts @@ -29,7 +29,7 @@ import { listOperationGroups, listOperationsInOperationGroup } from "@azure-tools/typespec-client-generator-core"; -import { Type, isVoidType } from "@typespec/compiler"; +import { NoTarget, Type, isVoidType } from "@typespec/compiler"; import { getBodyType, getFormattedPropertyDoc, @@ -46,6 +46,7 @@ import { } from "../utils/operationUtil.js"; import { SdkContext } from "../utils/interfaces.js"; +import { reportDiagnostic } from "../lib.js"; export function transformToParameterTypes( client: SdkClient, @@ -99,6 +100,8 @@ export function transformToParameterTypes( ); // transform path param const pathParams = transformPathParameters(); + // TODO: support cookie parameters, https://github.com/Azure/autorest.typescript/issues/2898 + transformCookieParameters(dpgContext, parameters); // transform header param including content-type const headerParams = transformHeaderParameters( dpgContext, @@ -200,6 +203,25 @@ function getParameterName(name: string) { return `"${name}"`; } +function transformCookieParameters( + dpgContext: SdkContext, + parameters: HttpOperationParameters +) { + // TODO: support cookie parameters, https://github.com/Azure/autorest.typescript/issues/2898 + parameters.parameters + .filter((p) => p.type === "cookie") + .forEach((p) => { + reportDiagnostic(dpgContext.program, { + code: "parameter-type-not-supported", + format: { + paramName: p.name, + paramType: p.type + }, + target: NoTarget + }); + }); +} + function transformQueryParameters( dpgContext: SdkContext, parameters: HttpOperationParameters, From eea815ef5d1dddf2f568cd7c1560889eab35429b Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:28:22 +0800 Subject: [PATCH 04/16] update the ut for rlc and modular --- .../cookieParam/ignoreCookieParam.md | 61 +++++++++++++++++++ .../test/unit/parametersGenerator.spec.ts | 25 ++++++++ 2 files changed, 86 insertions(+) create mode 100644 packages/typespec-ts/test/modularUnit/scenarios/operations/cookieParam/ignoreCookieParam.md diff --git a/packages/typespec-ts/test/modularUnit/scenarios/operations/cookieParam/ignoreCookieParam.md b/packages/typespec-ts/test/modularUnit/scenarios/operations/cookieParam/ignoreCookieParam.md new file mode 100644 index 0000000000..51f2987604 --- /dev/null +++ b/packages/typespec-ts/test/modularUnit/scenarios/operations/cookieParam/ignoreCookieParam.md @@ -0,0 +1,61 @@ +# Should ignore cookie parameters for now + +// TODO: https://github.com/Azure/autorest.typescript/issues/2898 + +## TypeSpec + +This is tsp definition. + +```tsp +op test(@cookie token: string): string; +``` + +Should ingore the warning `@azure-tools/typespec-ts/parameter-type-not-supported`: + +```yaml +mustEmptyDiagnostic: false +``` + +## Provide generated operations to call rest-level methods + +## Operations + +Should normal path parameter: + +```ts operations +import { TestingContext as Client } from "./index.js"; +import { + StreamableMethod, + PathUncheckedResponse, + createRestError, + operationOptionsToRequestParameters +} from "@azure-rest/core-client"; + +export function _testSend( + context: Client, + options: TestOptionalParams = { requestOptions: {} } +): StreamableMethod { + return context + .path("/") + .get({ ...operationOptionsToRequestParameters(options) }); +} + +export async function _testDeserialize( + result: PathUncheckedResponse +): Promise { + const expectedStatuses = ["200"]; + if (!expectedStatuses.includes(result.status)) { + throw createRestError(result); + } + + return result.body; +} + +export async function test( + context: Client, + options: TestOptionalParams = { requestOptions: {} } +): Promise { + const result = await _testSend(context, options); + return _testDeserialize(result); +} +``` diff --git a/packages/typespec-ts/test/unit/parametersGenerator.spec.ts b/packages/typespec-ts/test/unit/parametersGenerator.spec.ts index 8eb6f4d43b..a02bfb9c62 100644 --- a/packages/typespec-ts/test/unit/parametersGenerator.spec.ts +++ b/packages/typespec-ts/test/unit/parametersGenerator.spec.ts @@ -7,6 +7,31 @@ import { import { assertEqualContent } from "../util/testUtil.js"; describe("Parameters.ts", () => { + describe("cookie parameters", () => { + it("should report warning for cookie parameter", async () => { + try { + await emitParameterFromTypeSpec( + ` + op test(@cookie token: string): string; + ` + ); + assert.fail("should throw error"); + } catch (e: any) { + assert.strictEqual("Parameter 'token' with type 'cookie' is not supported and we would ignore this parameter.", e[0].message); + } + }); + + it("should not include cookie parameter", async () => { + const parameters = await emitParameterFromTypeSpec( + ` + op test(@cookie token: string): string; + ` + , { + mustEmptyDiagnostic: false + }); + assert.notDeepInclude(parameters?.content, "token"); + }); + }); describe("query parameters", () => { describe("apiVersion in query", () => { it("should not generate apiVersion if there's a client level apiVersion but without default value", async () => { From 01bfa0a2b5b054a368767899b0868b962ae9aaad Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:33:37 +0800 Subject: [PATCH 05/16] Merge to main --- common/config/rush/pnpm-lock.yaml | 421 +++++++++++++++--------------- 1 file changed, 217 insertions(+), 204 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 134e1a331f..df980f717b 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -191,34 +191,36 @@ importers: ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-azure-rulesets': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.47.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.62.0 <1.0.0' - '@typespec/http': '>=0.62.0 <1.0.0' - '@typespec/openapi': '>=0.62.0 <1.0.0' - '@typespec/openapi3': '>=0.62.0 <1.0.0' - '@typespec/rest': '>=0.62.0 <1.0.0' - '@typespec/versioning': '>=0.62.0 <1.0.0' + '@typespec/compiler': '>=0.61.2 <1.0.0' + '@typespec/http': '>=0.61.0 <1.0.0' + '@typespec/openapi': '>=0.61.0 <1.0.0' + '@typespec/openapi3': '>=0.61.0 <1.0.0' + '@typespec/rest': '>=0.61.0 <1.0.0' + '@typespec/versioning': '>=0.61.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 typescript: ~5.6.2 dependencies: - '@azure-tools/typespec-autorest': 0.48.0_k3ixffjro63fkoc7q7z6mrfsdq - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku - '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-autorest': 0.47.0_rib5axdcd64bxmzq35qykcrahq + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-azure-rulesets': 0.47.0_b25iwclywefnqfkiov4zadde3a + '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/openapi3': 0.62.0_w4ienkqkqg3jsox2pddtpe4f5m - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/openapi3': 0.61.0_55ilrakjwebv5frpjugw2fujmu + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 @@ -229,15 +231,15 @@ importers: ../../packages/typespec-ts: specifiers: '@azure-rest/core-client': ^2.3.1 - '@azure-tools/cadl-ranch': ^0.16.1 + '@azure-tools/cadl-ranch': ^0.15.0 '@azure-tools/cadl-ranch-api': ^0.5.0 - '@azure-tools/cadl-ranch-expect': ^0.15.6 - '@azure-tools/cadl-ranch-specs': ^0.39.1 + '@azure-tools/cadl-ranch-expect': ^0.15.5 + '@azure-tools/cadl-ranch-specs': ^0.38.0 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.47.4 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 '@azure/core-lro': ^3.1.0 @@ -253,12 +255,12 @@ importers: '@types/node': ^18.0.0 '@typescript-eslint/eslint-plugin': ^6.8.0 '@typescript-eslint/parser': ^6.8.0 - '@typespec/compiler': '>=0.62.0 <1.0.0' - '@typespec/http': '>=0.62.0 <1.0.0' - '@typespec/openapi': '>=0.62.0, <1.0.0' - '@typespec/rest': '>=0.62.0 <1.0.0' + '@typespec/compiler': '>=0.61.2 <1.0.0' + '@typespec/http': '>=0.61.0 <1.0.0' + '@typespec/openapi': '>=0.61.0, <1.0.0' + '@typespec/rest': '>=0.61.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.62.0 <1.0.0' + '@typespec/versioning': '>=0.61.0 <1.0.0' '@vitest/coverage-istanbul': ~1.6.0 '@vitest/coverage-v8': ~1.6.0 chai: ^4.3.6 @@ -288,14 +290,14 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.3.1 - '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i + '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y - '@azure-tools/cadl-ranch-specs': 0.39.1_fm5bpb4bfczzprftnu3bq22rpm - '@azure-tools/typespec-autorest': 0.48.0_k3ixffjro63fkoc7q7z6mrfsdq - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku - '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi + '@azure-tools/cadl-ranch-specs': 0.38.0_ouo3nkt6333nzbxz2spj76mz74 + '@azure-tools/typespec-autorest': 0.47.0_rib5axdcd64bxmzq35qykcrahq + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 '@azure/core-lro': 3.1.0 @@ -311,12 +313,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.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 '@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,42 +442,42 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.6_f5giq3reeireto67b6daw62k5y: - resolution: {integrity: sha512-t601oyRwiSy/Nbbro5A7OHZSKsVGxGRJMPnd4X80dYetTBinUHXS2+cVx+fVQlUmb/4Ru/qNOvG0jtTJY9/XHw==} + /@azure-tools/cadl-ranch-expect/0.15.5_str2psid7izwllhra2ow6hs7pi: + resolution: {integrity: sha512-7tr/FIDeFCJnDjEQ7J/A2MKmnmYrJBlTS7y9XjsWpJLC/fpB3lyvDvVYlsFmeO5dmnRc3+B4eEoWgWx46r3auA==} engines: {node: '>=16.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/rest': ~0.62.0 - '@typespec/versioning': ~0.62.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 dev: true - /@azure-tools/cadl-ranch-specs/0.39.1_fm5bpb4bfczzprftnu3bq22rpm: - resolution: {integrity: sha512-eZy1fHt9wVFQ4aHTEz9zCKW2vFk34mN3tB3Qbuk9tZMaD62FSHVO0PkawOTFuxOlhavRkd7sw2W2nihWIVVqeQ==} + /@azure-tools/cadl-ranch-specs/0.38.0_ouo3nkt6333nzbxz2spj76mz74: + resolution: {integrity: sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==} engines: {node: '>=16.0.0'} peerDependencies: - '@azure-tools/cadl-ranch-expect': ~0.15.6 - '@azure-tools/typespec-azure-core': ~0.48.0 - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/rest': ~0.62.0 - '@typespec/versioning': ~0.62.0 - '@typespec/xml': ~0.62.0 - dependencies: - '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i + '@azure-tools/cadl-ranch-expect': ~0.15.5 + '@azure-tools/typespec-azure-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 + '@typespec/xml': ~0.61.0 + dependencies: + '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/xml': 0.62.0_@typespec+compiler@0.62.0 + '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/xml': 0.61.0_@typespec+compiler@0.61.2 transitivePeerDependencies: - '@types/express' - '@typespec/streams' @@ -483,19 +485,19 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch/0.16.1_maorf56vredk4k7ivyf3kw4p7i: - resolution: {integrity: sha512-4tyd+2GDsZjkcsiB14T2m5imkPCokJkFLKrPe0mINb5Z6DVVzk/2BkhId//zk9KinpYL0ThG9ewM1ZeJ0jnoeg==} + /@azure-tools/cadl-ranch/0.15.0_d4yylgqtsey5a7wubqjw5gjsq4: + resolution: {integrity: sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-coverage-sdk': 0.9.0 - '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y + '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy ajv: 8.17.1 axios: 1.7.7 body-parser: 1.20.3 @@ -548,77 +550,92 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.48.0_k3ixffjro63fkoc7q7z6mrfsdq: - resolution: {integrity: sha512-AyoNMq3EORugHynFF8bN0TJh+zYxui/ApU5DoVEL7Xr1yMD6k9p5b90VD4HiCsP0dz8470ApFnjt5Vl6xCSzig==} + /@azure-tools/typespec-autorest/0.47.0_rib5axdcd64bxmzq35qykcrahq: + resolution: {integrity: sha512-uYkk8mnzekSMhJKU3RS0cXvKPH0vbkonthYoPe7/vxZ7tWv4xJLSglV2v3m3QElFgvNebNVoBOEWSY8Kz/ip2Q==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.48.0 - '@azure-tools/typespec-azure-resource-manager': ~0.48.0 - '@azure-tools/typespec-client-generator-core': ~0.48.0 - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/openapi': ~0.62.0 - '@typespec/rest': ~0.62.0 - '@typespec/versioning': ~0.62.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku - '@azure-tools/typespec-client-generator-core': 0.48.0_xptzwysxh7uiycxgwx225suwku - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 - - /@azure-tools/typespec-azure-core/0.48.0_aaegv3jydxpwng7gbukr25tg2m: - resolution: {integrity: sha512-80qyqgTgBbrnCGXtz6eWAMBdEAjYVVL780L0Ye+rBEd6VoA0m3JrgzUqf5bC0Iwju6lEtBAb8o6sefKD/NGA7g==} + '@azure-tools/typespec-azure-core': ~0.47.0 + '@azure-tools/typespec-azure-resource-manager': ~0.47.0 + '@azure-tools/typespec-client-generator-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/openapi': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + + /@azure-tools/typespec-azure-core/0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy: + resolution: {integrity: sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/rest': ~0.62.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/rest': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - /@azure-tools/typespec-azure-resource-manager/0.48.0_xptzwysxh7uiycxgwx225suwku: - resolution: {integrity: sha512-4JxPbKxd3EJ98sLbtfBlqyANWVrU6tT2nk3iLspg7MITPLhiMTeRT9BprsJXH18ks8qw8scR7/am5r57YERTmQ==} + /@azure-tools/typespec-azure-resource-manager/0.47.0_f62ldmasulsabis4qbnzkqboii: + resolution: {integrity: sha512-pe9XhHJezTZtVlSVKIMhL1kRATMg6QSaXUZQhQmQKSuozVRsRBxI4IAhK3RU4p6SA8A2CoCpPeJpRhQTvdt73Q==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.48.0 - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/openapi': ~0.62.0 - '@typespec/rest': ~0.62.0 - '@typespec/versioning': ~0.62.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@azure-tools/typespec-azure-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/openapi': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-client-generator-core/0.48.0_xptzwysxh7uiycxgwx225suwku: - resolution: {integrity: sha512-+fmKjapz0kP7ONPZap8dgcIKIdQw+YBSrf89csbIyhPTcLnVAk/BKljo8FoNypKXwqKHenslLm0njBKPllkopg==} + /@azure-tools/typespec-azure-rulesets/0.47.0_b25iwclywefnqfkiov4zadde3a: + resolution: {integrity: sha512-CG6sGYc/9qKAQIWtauzH6yEoTdugfz4DEmiWcytJMhgw1tQ2bqmcJuar01ctDKuaD5F1PKZ0X3oAxPu84pIlqw==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.48.0 - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/openapi': ~0.62.0 - '@typespec/rest': ~0.62.0 - '@typespec/versioning': ~0.62.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@azure-tools/typespec-azure-core': ~0.47.0 + '@azure-tools/typespec-azure-resource-manager': ~0.47.0 + '@azure-tools/typespec-client-generator-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii + '@typespec/compiler': 0.61.2 + dev: false + + /@azure-tools/typespec-client-generator-core/0.47.4_f62ldmasulsabis4qbnzkqboii: + resolution: {integrity: sha512-oXA8rHzBsoofzSXvGLGohj6VDYegtgAfGMWo2o4ubew1bS4cvl3CYl9DJ54blqafxtJXnNh4SdjadeHTsCz2mw==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@azure-tools/typespec-azure-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/openapi': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 change-case: 5.4.4 pluralize: 8.0.0 @@ -882,11 +899,11 @@ packages: - supports-color dev: true - /@babel/code-frame/7.25.9: - resolution: {integrity: sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==} + /@babel/code-frame/7.24.7: + resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.25.9 + '@babel/highlight': 7.24.7 picocolors: 1.1.0 /@babel/compat-data/7.24.7: @@ -899,7 +916,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 '@babel/generator': 7.24.7 '@babel/helper-compilation-targets': 7.24.7 '@babel/helper-module-transforms': 7.24.7_@babel+core@7.24.7 @@ -981,7 +998,7 @@ packages: '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-validator-identifier': 7.24.7 transitivePeerDependencies: - supports-color dev: true @@ -1008,8 +1025,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier/7.25.9: - resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} + /@babel/helper-validator-identifier/7.24.7: + resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} engines: {node: '>=6.9.0'} /@babel/helper-validator-option/7.24.7: @@ -1025,11 +1042,11 @@ packages: '@babel/types': 7.24.7 dev: true - /@babel/highlight/7.25.9: - resolution: {integrity: sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==} + /@babel/highlight/7.24.7: + resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-validator-identifier': 7.24.7 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.0 @@ -1051,7 +1068,7 @@ packages: resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 '@babel/parser': 7.24.7 '@babel/types': 7.24.7 dev: true @@ -1060,7 +1077,7 @@ packages: resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 '@babel/generator': 7.24.7 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 @@ -1079,7 +1096,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.7 - '@babel/helper-validator-identifier': 7.25.9 + '@babel/helper-validator-identifier': 7.24.7 to-fast-properties: 2.0.0 dev: true @@ -1800,7 +1817,7 @@ packages: peerDependencies: ajv: 4.11.8 - 8 dependencies: - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 '@babel/runtime': 7.24.8 '@humanwhocodes/momoa': 2.0.4 ajv: 8.17.1 @@ -2385,12 +2402,12 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typespec/compiler/0.62.0: - resolution: {integrity: sha512-RfKJ/rF2Wjxu7dl74oJE8yEfSkeL7NopFlyJ4dW1JQXpRN2IOJYPxas12qZA6H9ZEIB8rBjyrHNxJSQbvn/UDQ==} + /@typespec/compiler/0.61.2: + resolution: {integrity: sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==} engines: {node: '>=18.0.0'} hasBin: true dependencies: - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 ajv: 8.17.1 change-case: 5.4.4 globby: 14.0.2 @@ -2405,61 +2422,57 @@ packages: yaml: 2.5.1 yargs: 17.7.2 - /@typespec/http/0.62.0_@typespec+compiler@0.62.0: - resolution: {integrity: sha512-6H9y9e32lb2s76MMy29ITCwSZNG42sa/qWthiByUvfbTEXMpu5a1fQHNj7RXg+xmDKmVIHv3gAfjGPAWfXhkaQ==} + /@typespec/http/0.61.0_@typespec+compiler@0.61.2: + resolution: {integrity: sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/streams': ~0.62.0 + '@typespec/compiler': ~0.61.0 + '@typespec/streams': ~0.61.0 peerDependenciesMeta: '@typespec/streams': optional: true dependencies: - '@typespec/compiler': 0.62.0 + '@typespec/compiler': 0.61.2 - /@typespec/openapi/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: - resolution: {integrity: sha512-Xtm0Nd2BuSmEfSWGtc10ok22jyomYm9L2jY+kVTy+v5J89DrVh0o6+YpipUl1QhcItM1YMBphWHIHPfwkDRbnw==} + /@typespec/openapi/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: + resolution: {integrity: sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - /@typespec/openapi3/0.62.0_w4ienkqkqg3jsox2pddtpe4f5m: - resolution: {integrity: sha512-tfmaPvZ38fM+O5+ZBq4ic7fc32E3v0JOFP9h+7otQyrVprLVCToXpBwaxB7c2nTSJbI4vcxK7/T3Z8BD5j8X+w==} + /@typespec/openapi3/0.61.0_55ilrakjwebv5frpjugw2fujmu: + resolution: {integrity: sha512-ALLsTkK1UiJBzvygV1Zk/yZaym+lOWroGeEUhQNXYShsq+/GLZkK0rl8sd76Gigq+TVXKMOEwUUvgfws/LMUJw==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 - '@typespec/openapi': ~0.62.0 - '@typespec/versioning': ~0.62.0 - '@typespec/xml': '*' - peerDependenciesMeta: - '@typespec/xml': - optional: true + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/openapi': ~0.61.0 + '@typespec/versioning': ~0.61.0 dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 yaml: 2.5.1 transitivePeerDependencies: - openapi-types dev: false - /@typespec/rest/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: - resolution: {integrity: sha512-ci5UjelEKFwsPTdpgysoUoDCcw02EnbG4GBuYJdR5mRrFCBZMxrbro+OJLgSN3g/TORSsWlW7dEOWLfbyrmlZQ==} + /@typespec/rest/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: + resolution: {integrity: sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 - '@typespec/http': ~0.62.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2472,21 +2485,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.62.0_@typespec+compiler@0.62.0: - resolution: {integrity: sha512-M5KTCVH5fBniZU8eQlw+NV13vAmPr58HyBLDIyxeOuV+SHNlx+f+qanUEDIPaJheKlaSSNTEZKsDhs83/iIMMA==} + /@typespec/versioning/0.61.0_@typespec+compiler@0.61.2: + resolution: {integrity: sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 + '@typespec/compiler': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 + '@typespec/compiler': 0.61.2 - /@typespec/xml/0.62.0_@typespec+compiler@0.62.0: - resolution: {integrity: sha512-DexGTQHB75fncDcYfs5CIbNwO6NOhjwCaaNoHYAsVVzs4T8qwzw6WQdEEMzZRbgsxwnllFkxKwGhLtRMQdv/cQ==} + /@typespec/xml/0.61.0_@typespec+compiler@0.61.2: + resolution: {integrity: sha512-LnMYyzB7f6C8rBZmQwhKyJOJ8mUTFls6aVKXw4EAaO2+HPsm73GN16lj1bt2ffbWR3izCGnz911K2wGtUrtSpA==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 + '@typespec/compiler': ~0.61.0 dependencies: - '@typespec/compiler': 0.62.0 + '@typespec/compiler': 0.61.2 dev: true /@ungap/promise-all-settled/1.1.2: @@ -3717,7 +3730,7 @@ packages: dependencies: get-intrinsic: 1.2.4 gopd: 1.0.1 - has-property-descriptors: 1.0.2 + has-property-descriptors: 1.0.0 dev: true /define-data-property/1.1.4: @@ -3949,16 +3962,16 @@ packages: array-buffer-byte-length: 1.0.0 arraybuffer.prototype.slice: 1.0.2 available-typed-arrays: 1.0.5 - call-bind: 1.0.7 + call-bind: 1.0.2 es-set-tostringtag: 2.0.1 es-to-primitive: 1.2.1 function.prototype.name: 1.1.6 - get-intrinsic: 1.2.4 + get-intrinsic: 1.2.1 get-symbol-description: 1.0.0 globalthis: 1.0.3 gopd: 1.0.1 has: 1.0.3 - has-property-descriptors: 1.0.2 + has-property-descriptors: 1.0.0 has-proto: 1.0.1 has-symbols: 1.0.3 internal-slot: 1.0.5 @@ -3970,7 +3983,7 @@ packages: is-string: 1.0.7 is-typed-array: 1.1.12 is-weakref: 1.0.2 - object-inspect: 1.13.2 + object-inspect: 1.12.3 object-keys: 1.1.1 object.assign: 4.1.4 regexp.prototype.flags: 1.5.1 @@ -5012,7 +5025,7 @@ packages: resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==} engines: {node: '>= 0.4.0'} dependencies: - function-bind: 1.1.2 + function-bind: 1.1.1 dev: true /hasown/2.0.2: @@ -5413,8 +5426,8 @@ packages: /is-weakset/2.0.2: resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==} dependencies: - call-bind: 1.0.7 - get-intrinsic: 1.2.4 + call-bind: 1.0.2 + get-intrinsic: 1.2.1 dev: true /is-wsl/2.2.0: @@ -6563,7 +6576,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.25.9 + '@babel/code-frame': 7.24.7 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 @@ -6857,7 +6870,7 @@ packages: resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==} engines: {node: '>=0.6'} dependencies: - side-channel: 1.0.6 + side-channel: 1.0.4 dev: true /qs/6.13.0: @@ -7284,9 +7297,9 @@ packages: resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==} engines: {node: '>= 0.4'} dependencies: - define-data-property: 1.1.4 + define-data-property: 1.1.0 functions-have-names: 1.2.3 - has-property-descriptors: 1.0.2 + has-property-descriptors: 1.0.0 dev: true /setprototypeof/1.2.0: From c0e1011889b8d83b0b2ea4666d6373b4779da24f Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:35:55 +0800 Subject: [PATCH 06/16] Update the lock file --- common/config/rush/pnpm-lock.yaml | 399 +++++++++++++++--------------- 1 file changed, 193 insertions(+), 206 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index df980f717b..13e61066a6 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -191,36 +191,34 @@ importers: ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-rulesets': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.47.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.48.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.61.2 <1.0.0' - '@typespec/http': '>=0.61.0 <1.0.0' - '@typespec/openapi': '>=0.61.0 <1.0.0' - '@typespec/openapi3': '>=0.61.0 <1.0.0' - '@typespec/rest': '>=0.61.0 <1.0.0' - '@typespec/versioning': '>=0.61.0 <1.0.0' + '@typespec/compiler': '>=0.62.0 <1.0.0' + '@typespec/http': '>=0.62.0 <1.0.0' + '@typespec/openapi': '>=0.62.0 <1.0.0' + '@typespec/openapi3': '>=0.62.0 <1.0.0' + '@typespec/rest': '>=0.62.0 <1.0.0' + '@typespec/versioning': '>=0.62.0 <1.0.0' prettier: ^3.1.0 ts-node: ^8.5.2 typescript: ~5.6.2 dependencies: - '@azure-tools/typespec-autorest': 0.47.0_rib5axdcd64bxmzq35qykcrahq - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-azure-rulesets': 0.47.0_b25iwclywefnqfkiov4zadde3a - '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii + '@azure-tools/typespec-autorest': 0.48.0_ox3wjptpcck6ih5jxiqdmkmsau + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.1_xptzwysxh7uiycxgwx225suwku '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/openapi3': 0.61.0_55ilrakjwebv5frpjugw2fujmu - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/openapi3': 0.62.0_w4ienkqkqg3jsox2pddtpe4f5m + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 prettier: 3.1.1 devDependencies: '@types/mocha': 5.2.7 @@ -231,15 +229,15 @@ importers: ../../packages/typespec-ts: specifiers: '@azure-rest/core-client': ^2.3.1 - '@azure-tools/cadl-ranch': ^0.15.0 + '@azure-tools/cadl-ranch': ^0.16.1 '@azure-tools/cadl-ranch-api': ^0.5.0 - '@azure-tools/cadl-ranch-expect': ^0.15.5 - '@azure-tools/cadl-ranch-specs': ^0.38.0 + '@azure-tools/cadl-ranch-expect': ^0.15.6 + '@azure-tools/cadl-ranch-specs': ^0.39.1 '@azure-tools/rlc-common': workspace:^0.33.0 - '@azure-tools/typespec-autorest': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-azure-resource-manager': '>=0.47.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.47.4 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.48.0 <1.0.0' '@azure/abort-controller': ^2.1.2 '@azure/core-auth': ^1.6.0 '@azure/core-lro': ^3.1.0 @@ -255,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.61.2 <1.0.0' - '@typespec/http': '>=0.61.0 <1.0.0' - '@typespec/openapi': '>=0.61.0, <1.0.0' - '@typespec/rest': '>=0.61.0 <1.0.0' + '@typespec/compiler': '>=0.62.0 <1.0.0' + '@typespec/http': '>=0.62.0 <1.0.0' + '@typespec/openapi': '>=0.62.0, <1.0.0' + '@typespec/rest': '>=0.62.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': '>=0.61.0 <1.0.0' + '@typespec/versioning': '>=0.62.0 <1.0.0' '@vitest/coverage-istanbul': ~1.6.0 '@vitest/coverage-v8': ~1.6.0 chai: ^4.3.6 @@ -290,14 +288,14 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.3.1 - '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 + '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi - '@azure-tools/cadl-ranch-specs': 0.38.0_ouo3nkt6333nzbxz2spj76mz74 - '@azure-tools/typespec-autorest': 0.47.0_rib5axdcd64bxmzq35qykcrahq - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y + '@azure-tools/cadl-ranch-specs': 0.39.1_fm5bpb4bfczzprftnu3bq22rpm + '@azure-tools/typespec-autorest': 0.48.0_ox3wjptpcck6ih5jxiqdmkmsau + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.1_xptzwysxh7uiycxgwx225suwku '@azure/abort-controller': 2.1.2 '@azure/core-auth': 1.6.0 '@azure/core-lro': 3.1.0 @@ -313,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.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe '@typespec/ts-http-runtime': 1.0.0-alpha.20240314.2 - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.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 @@ -442,42 +440,42 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.5_str2psid7izwllhra2ow6hs7pi: - resolution: {integrity: sha512-7tr/FIDeFCJnDjEQ7J/A2MKmnmYrJBlTS7y9XjsWpJLC/fpB3lyvDvVYlsFmeO5dmnRc3+B4eEoWgWx46r3auA==} + /@azure-tools/cadl-ranch-expect/0.15.6_f5giq3reeireto67b6daw62k5y: + resolution: {integrity: sha512-t601oyRwiSy/Nbbro5A7OHZSKsVGxGRJMPnd4X80dYetTBinUHXS2+cVx+fVQlUmb/4Ru/qNOvG0jtTJY9/XHw==} engines: {node: '>=16.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 dev: true - /@azure-tools/cadl-ranch-specs/0.38.0_ouo3nkt6333nzbxz2spj76mz74: - resolution: {integrity: sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==} + /@azure-tools/cadl-ranch-specs/0.39.1_fm5bpb4bfczzprftnu3bq22rpm: + resolution: {integrity: sha512-eZy1fHt9wVFQ4aHTEz9zCKW2vFk34mN3tB3Qbuk9tZMaD62FSHVO0PkawOTFuxOlhavRkd7sw2W2nihWIVVqeQ==} engines: {node: '>=16.0.0'} peerDependencies: - '@azure-tools/cadl-ranch-expect': ~0.15.5 - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - '@typespec/xml': ~0.61.0 - dependencies: - '@azure-tools/cadl-ranch': 0.15.0_d4yylgqtsey5a7wubqjw5gjsq4 + '@azure-tools/cadl-ranch-expect': ~0.15.6 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + '@typespec/xml': ~0.62.0 + dependencies: + '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/xml': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/xml': 0.62.0_@typespec+compiler@0.62.0 transitivePeerDependencies: - '@types/express' - '@typespec/streams' @@ -485,19 +483,19 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch/0.15.0_d4yylgqtsey5a7wubqjw5gjsq4: - resolution: {integrity: sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==} + /@azure-tools/cadl-ranch/0.16.1_maorf56vredk4k7ivyf3kw4p7i: + resolution: {integrity: sha512-4tyd+2GDsZjkcsiB14T2m5imkPCokJkFLKrPe0mINb5Z6DVVzk/2BkhId//zk9KinpYL0ThG9ewM1ZeJ0jnoeg==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-coverage-sdk': 0.9.0 - '@azure-tools/cadl-ranch-expect': 0.15.5_str2psid7izwllhra2ow6hs7pi + '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y '@azure/identity': 4.4.1 '@types/js-yaml': 4.0.6 - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe ajv: 8.17.1 axios: 1.7.7 body-parser: 1.20.3 @@ -550,92 +548,77 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.47.0_rib5axdcd64bxmzq35qykcrahq: - resolution: {integrity: sha512-uYkk8mnzekSMhJKU3RS0cXvKPH0vbkonthYoPe7/vxZ7tWv4xJLSglV2v3m3QElFgvNebNVoBOEWSY8Kz/ip2Q==} + /@azure-tools/typespec-autorest/0.48.0_ox3wjptpcck6ih5jxiqdmkmsau: + resolution: {integrity: sha512-AyoNMq3EORugHynFF8bN0TJh+zYxui/ApU5DoVEL7Xr1yMD6k9p5b90VD4HiCsP0dz8470ApFnjt5Vl6xCSzig==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@azure-tools/typespec-azure-resource-manager': ~0.47.0 - '@azure-tools/typespec-client-generator-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 - - /@azure-tools/typespec-azure-core/0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy: - resolution: {integrity: sha512-RcBC5+dE1BVXTrUkkKULTImGxzM/ea3P3IL2kr9pk7r1uqF7D4CGqEKHFTg5L6QUtqc1f+zgTgQTNn6t4gI92w==} + '@azure-tools/typespec-azure-core': ~0.48.0 + '@azure-tools/typespec-azure-resource-manager': ~0.48.0 + '@azure-tools/typespec-client-generator-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.1_xptzwysxh7uiycxgwx225suwku + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + + /@azure-tools/typespec-azure-core/0.48.0_aaegv3jydxpwng7gbukr25tg2m: + resolution: {integrity: sha512-80qyqgTgBbrnCGXtz6eWAMBdEAjYVVL780L0Ye+rBEd6VoA0m3JrgzUqf5bC0Iwju6lEtBAb8o6sefKD/NGA7g==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/rest': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/rest': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - /@azure-tools/typespec-azure-resource-manager/0.47.0_f62ldmasulsabis4qbnzkqboii: - resolution: {integrity: sha512-pe9XhHJezTZtVlSVKIMhL1kRATMg6QSaXUZQhQmQKSuozVRsRBxI4IAhK3RU4p6SA8A2CoCpPeJpRhQTvdt73Q==} + /@azure-tools/typespec-azure-resource-manager/0.48.0_xptzwysxh7uiycxgwx225suwku: + resolution: {integrity: sha512-4JxPbKxd3EJ98sLbtfBlqyANWVrU6tT2nk3iLspg7MITPLhiMTeRT9BprsJXH18ks8qw8scR7/am5r57YERTmQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 change-case: 5.4.4 pluralize: 8.0.0 - /@azure-tools/typespec-azure-rulesets/0.47.0_b25iwclywefnqfkiov4zadde3a: - resolution: {integrity: sha512-CG6sGYc/9qKAQIWtauzH6yEoTdugfz4DEmiWcytJMhgw1tQ2bqmcJuar01ctDKuaD5F1PKZ0X3oAxPu84pIlqw==} + /@azure-tools/typespec-client-generator-core/0.48.1_xptzwysxh7uiycxgwx225suwku: + resolution: {integrity: sha512-pYEZDExltNNLAaA12EwEag5VLESyPoKNQQ/6Olj4rJouA4cBjZDTW80VYgKuPQBt/uCtA0Yn6xxl0nH7TGOwWQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@azure-tools/typespec-azure-resource-manager': ~0.47.0 - '@azure-tools/typespec-client-generator-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@azure-tools/typespec-azure-resource-manager': 0.47.0_f62ldmasulsabis4qbnzkqboii - '@azure-tools/typespec-client-generator-core': 0.47.4_f62ldmasulsabis4qbnzkqboii - '@typespec/compiler': 0.61.2 - dev: false - - /@azure-tools/typespec-client-generator-core/0.47.4_f62ldmasulsabis4qbnzkqboii: - resolution: {integrity: sha512-oXA8rHzBsoofzSXvGLGohj6VDYegtgAfGMWo2o4ubew1bS4cvl3CYl9DJ54blqafxtJXnNh4SdjadeHTsCz2mw==} - engines: {node: '>=18.0.0'} - peerDependencies: - '@azure-tools/typespec-azure-core': ~0.47.0 - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/rest': ~0.61.0 - '@typespec/versioning': ~0.61.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.47.0_fxc6wb4hdwr6r5hw5qrofq3aoy - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@azure-tools/typespec-azure-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/rest': ~0.62.0 + '@typespec/versioning': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 change-case: 5.4.4 pluralize: 8.0.0 @@ -899,11 +882,11 @@ packages: - supports-color dev: true - /@babel/code-frame/7.24.7: - resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} + /@babel/code-frame/7.25.9: + resolution: {integrity: sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==} engines: {node: '>=6.9.0'} dependencies: - '@babel/highlight': 7.24.7 + '@babel/highlight': 7.25.9 picocolors: 1.1.0 /@babel/compat-data/7.24.7: @@ -916,7 +899,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/generator': 7.24.7 '@babel/helper-compilation-targets': 7.24.7 '@babel/helper-module-transforms': 7.24.7_@babel+core@7.24.7 @@ -998,7 +981,7 @@ packages: '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 transitivePeerDependencies: - supports-color dev: true @@ -1025,8 +1008,8 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-validator-identifier/7.24.7: - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} + /@babel/helper-validator-identifier/7.25.9: + resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==} engines: {node: '>=6.9.0'} /@babel/helper-validator-option/7.24.7: @@ -1042,11 +1025,11 @@ packages: '@babel/types': 7.24.7 dev: true - /@babel/highlight/7.24.7: - resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} + /@babel/highlight/7.25.9: + resolution: {integrity: sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 chalk: 2.4.2 js-tokens: 4.0.0 picocolors: 1.1.0 @@ -1068,7 +1051,7 @@ packages: resolution: {integrity: sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/parser': 7.24.7 '@babel/types': 7.24.7 dev: true @@ -1077,7 +1060,7 @@ packages: resolution: {integrity: sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/generator': 7.24.7 '@babel/helper-environment-visitor': 7.24.7 '@babel/helper-function-name': 7.24.7 @@ -1096,7 +1079,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.9 to-fast-properties: 2.0.0 dev: true @@ -1817,7 +1800,7 @@ packages: peerDependencies: ajv: 4.11.8 - 8 dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 '@babel/runtime': 7.24.8 '@humanwhocodes/momoa': 2.0.4 ajv: 8.17.1 @@ -2402,12 +2385,12 @@ packages: eslint-visitor-keys: 3.4.3 dev: true - /@typespec/compiler/0.61.2: - resolution: {integrity: sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==} + /@typespec/compiler/0.62.0: + resolution: {integrity: sha512-RfKJ/rF2Wjxu7dl74oJE8yEfSkeL7NopFlyJ4dW1JQXpRN2IOJYPxas12qZA6H9ZEIB8rBjyrHNxJSQbvn/UDQ==} engines: {node: '>=18.0.0'} hasBin: true dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 ajv: 8.17.1 change-case: 5.4.4 globby: 14.0.2 @@ -2422,57 +2405,61 @@ packages: yaml: 2.5.1 yargs: 17.7.2 - /@typespec/http/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==} + /@typespec/http/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-6H9y9e32lb2s76MMy29ITCwSZNG42sa/qWthiByUvfbTEXMpu5a1fQHNj7RXg+xmDKmVIHv3gAfjGPAWfXhkaQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/streams': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/streams': ~0.62.0 peerDependenciesMeta: '@typespec/streams': optional: true dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 - /@typespec/openapi/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: - resolution: {integrity: sha512-3AF319Ae4yGVOscsCLQeedXUJJcL/NdGOR2/e/nFiL/AOVdgLfIRnpR0Ad9Zj9XAESh1fq9XSu4Mi7N1k4V7rw==} + /@typespec/openapi/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: + resolution: {integrity: sha512-Xtm0Nd2BuSmEfSWGtc10ok22jyomYm9L2jY+kVTy+v5J89DrVh0o6+YpipUl1QhcItM1YMBphWHIHPfwkDRbnw==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - /@typespec/openapi3/0.61.0_55ilrakjwebv5frpjugw2fujmu: - resolution: {integrity: sha512-ALLsTkK1UiJBzvygV1Zk/yZaym+lOWroGeEUhQNXYShsq+/GLZkK0rl8sd76Gigq+TVXKMOEwUUvgfws/LMUJw==} + /@typespec/openapi3/0.62.0_w4ienkqkqg3jsox2pddtpe4f5m: + resolution: {integrity: sha512-tfmaPvZ38fM+O5+ZBq4ic7fc32E3v0JOFP9h+7otQyrVprLVCToXpBwaxB7c2nTSJbI4vcxK7/T3Z8BD5j8X+w==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 - '@typespec/openapi': ~0.61.0 - '@typespec/versioning': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 + '@typespec/openapi': ~0.62.0 + '@typespec/versioning': ~0.62.0 + '@typespec/xml': '*' + peerDependenciesMeta: + '@typespec/xml': + optional: true dependencies: '@readme/openapi-parser': 2.6.0_openapi-types@7.2.3 - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 - '@typespec/openapi': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy - '@typespec/versioning': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/openapi': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 yaml: 2.5.1 transitivePeerDependencies: - openapi-types dev: false - /@typespec/rest/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: - resolution: {integrity: sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==} + /@typespec/rest/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: + resolution: {integrity: sha512-ci5UjelEKFwsPTdpgysoUoDCcw02EnbG4GBuYJdR5mRrFCBZMxrbro+OJLgSN3g/TORSsWlW7dEOWLfbyrmlZQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 - '@typespec/http': ~0.61.0 + '@typespec/compiler': ~0.62.0 + '@typespec/http': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 - '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 /@typespec/ts-http-runtime/1.0.0-alpha.20240314.2: resolution: {integrity: sha512-Rc/bFkKLbrEo9KKXiSdRYNSmosZ1W6ycQKEKScpXvK4jaXFNyCvmS0tLv7rEN4EzEEds2fPzEHNtX4e8gMu/lA==} @@ -2485,21 +2472,21 @@ packages: - supports-color dev: true - /@typespec/versioning/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-PIIug6eg3zc7E+BBHyNHHQD+OBq3FU465nhKrLEp35iVji/sYFuPc1ywnELDuwJVRWm6nvqNL1vtnc+4lEk+oA==} + /@typespec/versioning/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-M5KTCVH5fBniZU8eQlw+NV13vAmPr58HyBLDIyxeOuV+SHNlx+f+qanUEDIPaJheKlaSSNTEZKsDhs83/iIMMA==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 + '@typespec/compiler': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 - /@typespec/xml/0.61.0_@typespec+compiler@0.61.2: - resolution: {integrity: sha512-LnMYyzB7f6C8rBZmQwhKyJOJ8mUTFls6aVKXw4EAaO2+HPsm73GN16lj1bt2ffbWR3izCGnz911K2wGtUrtSpA==} + /@typespec/xml/0.62.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-DexGTQHB75fncDcYfs5CIbNwO6NOhjwCaaNoHYAsVVzs4T8qwzw6WQdEEMzZRbgsxwnllFkxKwGhLtRMQdv/cQ==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.61.0 + '@typespec/compiler': ~0.62.0 dependencies: - '@typespec/compiler': 0.61.2 + '@typespec/compiler': 0.62.0 dev: true /@ungap/promise-all-settled/1.1.2: @@ -6576,7 +6563,7 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} dependencies: - '@babel/code-frame': 7.24.7 + '@babel/code-frame': 7.25.9 error-ex: 1.3.2 json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 From 753e773ee67c2095856f9d2fa609b697eaee10da Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 14:50:34 +0800 Subject: [PATCH 07/16] Update the nextlink to azure core's one --- packages/typespec-ts/test/modularUnit/operations.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/typespec-ts/test/modularUnit/operations.spec.ts b/packages/typespec-ts/test/modularUnit/operations.spec.ts index 6c222432a5..290d5eca31 100644 --- a/packages/typespec-ts/test/modularUnit/operations.spec.ts +++ b/packages/typespec-ts/test/modularUnit/operations.spec.ts @@ -719,7 +719,7 @@ describe("operations", () => { model Bar { @items lists: string[]; - @nextLink + @Azure.Core.nextLink nextLink: string; } From f0e432fab121e2bb07599e893a71f9db79cabe55 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 15:35:43 +0800 Subject: [PATCH 08/16] Fix RLC ut failure --- .../test/unit/pageHelperGenerator.spec.ts | 2 +- packages/typespec-ts/test/util/testUtil.ts | 22 +++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/packages/typespec-ts/test/unit/pageHelperGenerator.spec.ts b/packages/typespec-ts/test/unit/pageHelperGenerator.spec.ts index 5d153dc228..22d59d14df 100644 --- a/packages/typespec-ts/test/unit/pageHelperGenerator.spec.ts +++ b/packages/typespec-ts/test/unit/pageHelperGenerator.spec.ts @@ -23,7 +23,7 @@ async function generatePagingHelper(code: string) { @doc("List of items.") customizedItems: T[]; - @nextLink + @global.Azure.Core.nextLink @doc("Link to fetch more items.") #suppress "@azure-tools/typespec-azure-core/casing-style" "for test" \`@odata.nextLink\`?: string; diff --git a/packages/typespec-ts/test/util/testUtil.ts b/packages/typespec-ts/test/util/testUtil.ts index c4ce8c8aea..671bde3f35 100644 --- a/packages/typespec-ts/test/util/testUtil.ts +++ b/packages/typespec-ts/test/util/testUtil.ts @@ -66,7 +66,7 @@ export interface RLCEmitterOptions { export async function rlcEmitterFor( code: string, - { + { needNamespaces = true, needAzureCore = false, needTCGC = false, @@ -95,11 +95,10 @@ import "@typespec/rest"; import "@typespec/versioning"; ${needTCGC ? 'import "@azure-tools/typespec-client-generator-core";' : ""} ${needAzureCore ? 'import "@azure-tools/typespec-azure-core";' : ""} -${ - needArmTemplate - ? 'import "@azure-tools/typespec-azure-resource-manager";' - : "" -} +${needArmTemplate + ? 'import "@azure-tools/typespec-azure-resource-manager";' + : "" + } using TypeSpec.Rest; using TypeSpec.Http; @@ -108,11 +107,10 @@ ${needTCGC ? "using Azure.ClientGenerator.Core;" : ""} ${needAzureCore ? "using Azure.Core;" : ""} ${needNamespaces ? namespace : ""} ${needArmTemplate ? "using Azure.ResourceManager;" : ""} -${ - withVersionedApiVersion && needNamespaces - ? 'enum Versions { v2022_05_15_preview: "2022-05-15-preview"}' - : "" -} +${withVersionedApiVersion && needNamespaces + ? 'enum Versions { v2022_05_15_preview: "2022-05-15-preview"}' + : "" + } ${code} `; host.addTypeSpecFile("main.tsp", content); @@ -217,8 +215,8 @@ export async function createDpgContextTestHelper( tcgcContext: sdkContext }); - provideSdkTypes(context); await provideBinderWithAzureDependencies(outputProject); + provideSdkTypes(context); return sdkContext; } From 2486e5df955ffcc440c50ec7af9425124313698a Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 15:50:18 +0800 Subject: [PATCH 09/16] Update the comments --- packages/typespec-ts/src/modular/buildCodeModel.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/typespec-ts/src/modular/buildCodeModel.ts b/packages/typespec-ts/src/modular/buildCodeModel.ts index 907fe5add1..c8eb6ff068 100644 --- a/packages/typespec-ts/src/modular/buildCodeModel.ts +++ b/packages/typespec-ts/src/modular/buildCodeModel.ts @@ -511,6 +511,7 @@ function emitParameter( implementation: string ): Parameter | undefined { if (parameter.type === "cookie") { + // TODO: support cookie parameters, https://github.com/Azure/autorest.typescript/issues/2898 reportDiagnostic(context.program, { code: "parameter-type-not-supported", format: { From de610d4c5f610609c21f86197430a8ca4a8708a7 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 16:17:54 +0800 Subject: [PATCH 10/16] Update the ruleset dependency --- common/config/rush/pnpm-lock.yaml | 17 +++++++++++++++++ packages/typespec-test/package.json | 1 + 2 files changed, 18 insertions(+) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 13e61066a6..1a84ce3641 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -194,6 +194,7 @@ importers: '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' '@azure-tools/typespec-azure-resource-manager': '>=0.48.0 <1.0.0' + '@azure-tools/typespec-azure-rulesets': '>=0.48.0 <1.0.0' '@azure-tools/typespec-client-generator-core': '>=0.48.0 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.33.0 '@types/mocha': ^5.2.7 @@ -211,6 +212,7 @@ importers: '@azure-tools/typespec-autorest': 0.48.0_ox3wjptpcck6ih5jxiqdmkmsau '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-azure-rulesets': 0.48.0_eibu3mzdg6wb26jplwmxghr54m '@azure-tools/typespec-client-generator-core': 0.48.1_xptzwysxh7uiycxgwx225suwku '@azure-tools/typespec-ts': link:../typespec-ts '@typespec/compiler': 0.62.0 @@ -602,6 +604,21 @@ packages: change-case: 5.4.4 pluralize: 8.0.0 + /@azure-tools/typespec-azure-rulesets/0.48.0_eibu3mzdg6wb26jplwmxghr54m: + resolution: {integrity: sha512-IkPxC8v9wVSl/eKU7N4NhqD3RPh+bIYpxDW5LBAhkuQVcE3RumAkWqh2pmkckihQRhgwiCXhcJVZAzBpVa5SUA==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@azure-tools/typespec-azure-core': ~0.48.0 + '@azure-tools/typespec-azure-resource-manager': ~0.48.0 + '@azure-tools/typespec-client-generator-core': ~0.48.0 + '@typespec/compiler': ~0.62.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m + '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku + '@azure-tools/typespec-client-generator-core': 0.48.1_xptzwysxh7uiycxgwx225suwku + '@typespec/compiler': 0.62.0 + dev: false + /@azure-tools/typespec-client-generator-core/0.48.1_xptzwysxh7uiycxgwx225suwku: resolution: {integrity: sha512-pYEZDExltNNLAaA12EwEag5VLESyPoKNQQ/6Olj4rJouA4cBjZDTW80VYgKuPQBt/uCtA0Yn6xxl0nH7TGOwWQ==} engines: {node: '>=18.0.0'} diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index e62899bb4c..e068b7addd 100644 --- a/packages/typespec-test/package.json +++ b/packages/typespec-test/package.json @@ -10,6 +10,7 @@ "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0", "@azure-tools/typespec-client-generator-core": ">=0.48.0 <1.0.0", "@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0", + "@azure-tools/typespec-azure-rulesets": ">=0.48.0 <1.0.0", "@typespec/compiler": ">=0.62.0 <1.0.0", "@typespec/http": ">=0.62.0 <1.0.0", "@typespec/rest": ">=0.62.0 <1.0.0", From 3bcbdbfddacb2b2c29d6646c8218e47d56c2db48 Mon Sep 17 00:00:00 2001 From: "Jiao Di (MSFT)" <80496810+v-jiaodi@users.noreply.github.com> Date: Mon, 11 Nov 2024 16:33:42 +0800 Subject: [PATCH 11/16] update @nextLink to @Azure.core.nextLink --- .../review/ai-anomaly-detector.api.md | 3 --- .../generated/typespec-ts/src/index.ts | 1 - .../generated/typespec-ts/src/models/index.ts | 1 - .../typespec-ts/src/models/models.ts | 3 --- .../spec/multivariate/models.tsp | 2 +- .../test/batch_modular/spec/models.tsp | 26 +++++++++---------- .../test/confidentialLedger/spec/main.tsp | 2 +- .../test/widget_dpg/spec/main.tsp | 2 +- 8 files changed, 16 insertions(+), 24 deletions(-) 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 9343baff99..0e724ef35a 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 @@ -22,9 +22,6 @@ export interface AnomalyDetectorClientOptionalParams extends ClientOptions { apiVersion?: string; } -// @public -export type APIVersion = "v1.1"; - // @public export type ContinuablePage = TPage & { continuationToken?: string; 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 28f00a7b74..1ffeb30c5e 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 @@ -41,7 +41,6 @@ export { UnivariateUnivariateLastDetectionResult, UnivariateUnivariateChangePointDetectionOptions, UnivariateUnivariateChangePointDetectionResult, - APIVersion, KnownVersions, } from "./models/index.js"; export { 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 7b124d4141..5eb7ae421a 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 @@ -34,6 +34,5 @@ export { UnivariateUnivariateLastDetectionResult, UnivariateUnivariateChangePointDetectionOptions, UnivariateUnivariateChangePointDetectionResult, - APIVersion, KnownVersions, } from "./models.js"; 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 cad4b4f7c6..deba0d49a3 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 @@ -1071,9 +1071,6 @@ export function univariateUnivariateChangePointDetectionResultDeserializer( }; } -/** Type of APIVersion */ -export type APIVersion = "v1.1"; - /** Known values of {@link Versions} that the service accepts. */ export enum KnownVersions { v1_1 = "v1.1", diff --git a/packages/typespec-test/test/anomalyDetector/spec/multivariate/models.tsp b/packages/typespec-test/test/anomalyDetector/spec/multivariate/models.tsp index 64e3d1bc9b..6d22a7532f 100644 --- a/packages/typespec-test/test/anomalyDetector/spec/multivariate/models.tsp +++ b/packages/typespec-test/test/anomalyDetector/spec/multivariate/models.tsp @@ -341,7 +341,7 @@ model ModelList { maxCount: int32; @doc("The link to fetch more models.") - @nextLink + @Azure.Core.nextLink nextLink?: string; } diff --git a/packages/typespec-test/test/batch_modular/spec/models.tsp b/packages/typespec-test/test/batch_modular/spec/models.tsp index dd214569e2..0a0f77fc03 100644 --- a/packages/typespec-test/test/batch_modular/spec/models.tsp +++ b/packages/typespec-test/test/batch_modular/spec/models.tsp @@ -586,7 +586,7 @@ model ApplicationListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -642,7 +642,7 @@ model PoolListUsageMetricsResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -673,7 +673,7 @@ model AccountListSupportedImagesResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -738,7 +738,7 @@ model PoolNodeCountsListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -1001,7 +1001,7 @@ model CertificateListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -1017,7 +1017,7 @@ model NodeFileListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -2228,7 +2228,7 @@ model BatchJobScheduleListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -2461,7 +2461,7 @@ model BatchJobListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -2477,7 +2477,7 @@ model BatchJobListPreparationAndReleaseTaskStatusResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -2998,7 +2998,7 @@ model BatchPoolListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -3422,7 +3422,7 @@ model BatchTaskListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -3783,7 +3783,7 @@ model BatchNodeListResult { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } @@ -3840,6 +3840,6 @@ model NodeVMExtensionList { value?: NodeVMExtension[]; @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } diff --git a/packages/typespec-test/test/confidentialLedger/spec/main.tsp b/packages/typespec-test/test/confidentialLedger/spec/main.tsp index 8160210844..653ab931b6 100644 --- a/packages/typespec-test/test/confidentialLedger/spec/main.tsp +++ b/packages/typespec-test/test/confidentialLedger/spec/main.tsp @@ -163,7 +163,7 @@ model PagedLedgerEntries { state: LedgerQueryState; @doc("Path from which to retrieve the next page of results.") - @nextLink + @Azure.Core.nextLink nextLink?: ResourceLocation; } diff --git a/packages/typespec-test/test/widget_dpg/spec/main.tsp b/packages/typespec-test/test/widget_dpg/spec/main.tsp index c1fb81bb15..2afb658195 100644 --- a/packages/typespec-test/test/widget_dpg/spec/main.tsp +++ b/packages/typespec-test/test/widget_dpg/spec/main.tsp @@ -78,7 +78,7 @@ model ListWidgetsPagesResults { @items results: Widget[]; @doc("The URL to get the next set of results.") - @nextLink + @Azure.Core.nextLink `odata.nextLink`?: string; } From f255359634bf0a40d33a3155808d9cd8f7d045e2 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 17:19:53 +0800 Subject: [PATCH 12/16] Update the failure for todo-non-branded.api --- .../generated/openapi/openapi.json | 16 ++++++++++++---- .../typespec-ts/review/todo-non-branded.api.md | 4 +++- .../generated/typespec-ts/src/responses.ts | 2 +- .../test/todo_non_branded/spec/main.tsp | 3 ++- 4 files changed, 18 insertions(+), 7 deletions(-) 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 e749bb9762..77416692e6 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 @@ -257,10 +257,18 @@ "content": { "application/json": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TodoAttachment" - } + "type": "object", + "properties": { + "items": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TodoAttachment" + } + } + }, + "required": [ + "items" + ] } } } diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md index 732e2ce5ac..c71c2e113f 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md +++ b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md @@ -170,7 +170,9 @@ export interface TodoItemsAttachmentsList { // @public export interface TodoItemsAttachmentsList200Response extends HttpResponse { // (undocumented) - body: TodoAttachmentOutput[]; + body: { + items: TodoAttachmentOutput[]; + }; // (undocumented) status: "200"; } 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 7e056ca567..939bfd3331 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 @@ -135,7 +135,7 @@ export interface TodoItemsDelete404Response extends HttpResponse { /** The request has succeeded. */ export interface TodoItemsAttachmentsList200Response extends HttpResponse { status: "200"; - body: TodoAttachmentOutput[]; + body: { items: TodoAttachmentOutput[] }; } /** The server cannot find the requested resource. */ diff --git a/packages/typespec-test/test/todo_non_branded/spec/main.tsp b/packages/typespec-test/test/todo_non_branded/spec/main.tsp index 68ad60a0fd..bb6ec5afa5 100644 --- a/packages/typespec-test/test/todo_non_branded/spec/main.tsp +++ b/packages/typespec-test/test/todo_non_branded/spec/main.tsp @@ -182,6 +182,7 @@ namespace TodoItems { model TodoPage { /** The items in the page */ + @pageItems items: TodoItem[]; pagination: { @@ -250,7 +251,7 @@ namespace TodoItems { namespace Attachments { @list op list( @path itemId: TodoItem.id, - ): TodoAttachment[] | NotFoundResponse; + ): { @pageItems items: TodoAttachment[] } | NotFoundResponse; @sharedRoute @post From 410d2af9b9892b6938b08905c9fcf0b2a8824036 Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 17:23:27 +0800 Subject: [PATCH 13/16] Remove the list decorator with error thrown --- .../generated/openapi/openapi.json | 16 +++------ .../generated/typespec-ts/package.json | 36 ++----------------- .../generated/typespec-ts/src/responses.ts | 2 +- .../test/todo_non_branded/spec/main.tsp | 4 +-- 4 files changed, 10 insertions(+), 48 deletions(-) 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 77416692e6..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 @@ -257,18 +257,10 @@ "content": { "application/json": { "schema": { - "type": "object", - "properties": { - "items": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TodoAttachment" - } - } - }, - "required": [ - "items" - ] + "type": "array", + "items": { + "$ref": "#/components/schemas/TodoAttachment" + } } } } diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json index 7942684ccf..c345030fb2 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json +++ b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json @@ -12,14 +12,8 @@ "./package.json": "./package.json", ".": "./src/index.ts" }, - "dialects": [ - "esm", - "commonjs" - ], - "esmDialects": [ - "browser", - "react-native" - ], + "dialects": ["esm", "commonjs"], + "esmDialects": ["browser", "react-native"], "selfLink": false }, "type": "module", @@ -43,29 +37,5 @@ "dependencies": { "tslib": "^2.6.2", "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2" - }, - "exports": { - "./package.json": "./package.json", - ".": { - "browser": { - "types": "./dist/browser/index.d.ts", - "default": "./dist/browser/index.js" - }, - "react-native": { - "types": "./dist/react-native/index.d.ts", - "default": "./dist/react-native/index.js" - }, - "import": { - "types": "./dist/esm/index.d.ts", - "default": "./dist/esm/index.js" - }, - "require": { - "types": "./dist/commonjs/index.d.ts", - "default": "./dist/commonjs/index.js" - } - } - }, - "main": "./dist/commonjs/index.js", - "types": "./dist/commonjs/index.d.ts", - "module": "./dist/esm/index.js" + } } 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 939bfd3331..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 @@ -135,7 +135,7 @@ export interface TodoItemsDelete404Response extends HttpResponse { /** The request has succeeded. */ export interface TodoItemsAttachmentsList200Response extends HttpResponse { status: "200"; - body: { items: TodoAttachmentOutput[] }; + body: TodoAttachmentOutput[]; } /** The server cannot find the requested resource. */ diff --git a/packages/typespec-test/test/todo_non_branded/spec/main.tsp b/packages/typespec-test/test/todo_non_branded/spec/main.tsp index bb6ec5afa5..1dd9dbc43e 100644 --- a/packages/typespec-test/test/todo_non_branded/spec/main.tsp +++ b/packages/typespec-test/test/todo_non_branded/spec/main.tsp @@ -249,9 +249,9 @@ namespace TodoItems { @route("{itemId}/attachments") namespace Attachments { - @list op list( + op list( @path itemId: TodoItem.id, - ): { @pageItems items: TodoAttachment[] } | NotFoundResponse; + ): TodoAttachment[] | NotFoundResponse; @sharedRoute @post From 88e9365a95ea0e8553a74f8776b628e44268c65b Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 17:25:34 +0800 Subject: [PATCH 14/16] Update the smoke test --- .../generated/typespec-ts/package.json | 36 +++++++++++++++++-- .../review/todo-non-branded.api.md | 4 +-- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json index c345030fb2..7942684ccf 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json +++ b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json @@ -12,8 +12,14 @@ "./package.json": "./package.json", ".": "./src/index.ts" }, - "dialects": ["esm", "commonjs"], - "esmDialects": ["browser", "react-native"], + "dialects": [ + "esm", + "commonjs" + ], + "esmDialects": [ + "browser", + "react-native" + ], "selfLink": false }, "type": "module", @@ -37,5 +43,29 @@ "dependencies": { "tslib": "^2.6.2", "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2" - } + }, + "exports": { + "./package.json": "./package.json", + ".": { + "browser": { + "types": "./dist/browser/index.d.ts", + "default": "./dist/browser/index.js" + }, + "react-native": { + "types": "./dist/react-native/index.d.ts", + "default": "./dist/react-native/index.js" + }, + "import": { + "types": "./dist/esm/index.d.ts", + "default": "./dist/esm/index.js" + }, + "require": { + "types": "./dist/commonjs/index.d.ts", + "default": "./dist/commonjs/index.js" + } + } + }, + "main": "./dist/commonjs/index.js", + "types": "./dist/commonjs/index.d.ts", + "module": "./dist/esm/index.js" } diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md index c71c2e113f..732e2ce5ac 100644 --- a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md +++ b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/review/todo-non-branded.api.md @@ -170,9 +170,7 @@ export interface TodoItemsAttachmentsList { // @public export interface TodoItemsAttachmentsList200Response extends HttpResponse { // (undocumented) - body: { - items: TodoAttachmentOutput[]; - }; + body: TodoAttachmentOutput[]; // (undocumented) status: "200"; } From 1ede9b90c64c55660f165e0993981a7b6743583d Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 19:55:04 +0800 Subject: [PATCH 15/16] Downgrade the cadl ranch version --- common/config/rush/pnpm-lock.yaml | 139 ++++++++++++++++++++++++++---- packages/typespec-ts/package.json | 2 +- 2 files changed, 124 insertions(+), 17 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 4effa5303b..7ca8c00942 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -234,7 +234,7 @@ importers: '@azure-tools/cadl-ranch': ^0.16.1 '@azure-tools/cadl-ranch-api': ^0.5.0 '@azure-tools/cadl-ranch-expect': ^0.15.6 - '@azure-tools/cadl-ranch-specs': ^0.39.1 + '@azure-tools/cadl-ranch-specs': ^0.38.0 '@azure-tools/rlc-common': workspace:^0.34.0 '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' '@azure-tools/typespec-azure-core': '>=0.48.0 <1.0.0' @@ -293,7 +293,7 @@ importers: '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y - '@azure-tools/cadl-ranch-specs': 0.39.1_fm5bpb4bfczzprftnu3bq22rpm + '@azure-tools/cadl-ranch-specs': 0.38.0_uv4m3qq5ivkac27hpehot5vivy '@azure-tools/typespec-autorest': 0.48.0_ox3wjptpcck6ih5jxiqdmkmsau '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m '@azure-tools/typespec-azure-resource-manager': 0.48.0_xptzwysxh7uiycxgwx225suwku @@ -442,7 +442,7 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.15.6_f5giq3reeireto67b6daw62k5y: + /@azure-tools/cadl-ranch-expect/0.15.6_3nr3pl3bbvepagmvirvhh4urmy: resolution: {integrity: sha512-t601oyRwiSy/Nbbro5A7OHZSKsVGxGRJMPnd4X80dYetTBinUHXS2+cVx+fVQlUmb/4Ru/qNOvG0jtTJY9/XHw==} engines: {node: '>=16.0.0'} peerDependencies: @@ -451,25 +451,40 @@ packages: '@typespec/rest': ~0.62.0 '@typespec/versioning': ~0.62.0 dependencies: - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 dev: true - /@azure-tools/cadl-ranch-specs/0.39.1_fm5bpb4bfczzprftnu3bq22rpm: - resolution: {integrity: sha512-eZy1fHt9wVFQ4aHTEz9zCKW2vFk34mN3tB3Qbuk9tZMaD62FSHVO0PkawOTFuxOlhavRkd7sw2W2nihWIVVqeQ==} + /@azure-tools/cadl-ranch-expect/0.15.6_f5giq3reeireto67b6daw62k5y: + resolution: {integrity: sha512-t601oyRwiSy/Nbbro5A7OHZSKsVGxGRJMPnd4X80dYetTBinUHXS2+cVx+fVQlUmb/4Ru/qNOvG0jtTJY9/XHw==} engines: {node: '>=16.0.0'} peerDependencies: - '@azure-tools/cadl-ranch-expect': ~0.15.6 - '@azure-tools/typespec-azure-core': ~0.48.0 '@typespec/compiler': ~0.62.0 '@typespec/http': ~0.62.0 '@typespec/rest': ~0.62.0 '@typespec/versioning': ~0.62.0 - '@typespec/xml': ~0.62.0 dependencies: - '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i + '@typespec/compiler': 0.62.0 + '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe + '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 + dev: true + + /@azure-tools/cadl-ranch-specs/0.38.0_uv4m3qq5ivkac27hpehot5vivy: + resolution: {integrity: sha512-AbOpERFpxYGmfFcSxDQl7ZeBy6FHEWFgqqw8FBRaugtVbeAj9BfUOPfc/OSEGNQmEIrzZJpH1N974JqhmKtKYg==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@azure-tools/cadl-ranch-expect': ~0.15.5 + '@azure-tools/typespec-azure-core': ~0.47.0 + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + '@typespec/rest': ~0.61.0 + '@typespec/versioning': ~0.61.0 + '@typespec/xml': ~0.61.0 + dependencies: + '@azure-tools/cadl-ranch': 0.15.0_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y '@azure-tools/typespec-azure-core': 0.48.0_aaegv3jydxpwng7gbukr25tg2m @@ -477,7 +492,7 @@ packages: '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe '@typespec/versioning': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/xml': 0.62.0_@typespec+compiler@0.62.0 + '@typespec/xml': 0.61.0_@typespec+compiler@0.62.0 transitivePeerDependencies: - '@types/express' - '@typespec/streams' @@ -485,6 +500,45 @@ packages: - supports-color dev: true + /@azure-tools/cadl-ranch/0.15.0_maorf56vredk4k7ivyf3kw4p7i: + resolution: {integrity: sha512-RU8AktXgCW7tuZF5yE2JCQdqY51qp5YJ8bvF82/M1tNwkN8GTxSXde3rBMyYnXJRd/DQUxaCqFMbwX1MgFBWFA==} + engines: {node: '>=16.0.0'} + hasBin: true + dependencies: + '@azure-tools/cadl-ranch-api': 0.5.0 + '@azure-tools/cadl-ranch-coverage-sdk': 0.9.0 + '@azure-tools/cadl-ranch-expect': 0.15.6_3nr3pl3bbvepagmvirvhh4urmy + '@azure/identity': 4.4.1 + '@types/js-yaml': 4.0.6 + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + '@typespec/rest': 0.61.0_rd6g2np7ypwc24nhrvozahtdfy + ajv: 8.17.1 + axios: 1.7.7 + body-parser: 1.20.3 + deep-equal: 2.2.2 + express: 4.21.1 + express-promise-router: 4.1.1_express@4.21.1 + form-data: 3.0.2 + glob: 11.0.0 + jackspeak: 4.0.1 + js-yaml: 4.1.0 + morgan: 1.10.0 + multer: 1.4.5-lts.1 + node-fetch: 3.3.2 + picocolors: 1.1.0 + source-map-support: 0.5.21 + winston: 3.14.1 + xml2js: 0.6.2 + yargs: 17.7.2 + transitivePeerDependencies: + - '@types/express' + - '@typespec/streams' + - '@typespec/versioning' + - debug + - supports-color + dev: true + /@azure-tools/cadl-ranch/0.16.1_maorf56vredk4k7ivyf3kw4p7i: resolution: {integrity: sha512-4tyd+2GDsZjkcsiB14T2m5imkPCokJkFLKrPe0mINb5Z6DVVzk/2BkhId//zk9KinpYL0ThG9ewM1ZeJ0jnoeg==} engines: {node: '>=16.0.0'} @@ -899,6 +953,14 @@ packages: - supports-color dev: true + /@babel/code-frame/7.24.7: + resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.25.9 + picocolors: 1.1.0 + dev: true + /@babel/code-frame/7.25.9: resolution: {integrity: sha512-z88xeGxnzehn2sqZ8UdGQEvYErF1odv2CftxInpSYJt6uHuPe9YjahKZITGs3l5LeI9d2ROG+obuDAoSlqbNfQ==} engines: {node: '>=6.9.0'} @@ -2402,6 +2464,27 @@ packages: eslint-visitor-keys: 3.4.3 dev: true + /@typespec/compiler/0.61.2: + resolution: {integrity: sha512-6QxYJd09VWssd/BvY+8eBxTVv085s1UNK63FdPrgT2lgI+j8VMMcpNR9m5l1zWlgGDM7sniA/Or8VCdVA6jerg==} + 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.1.0 + 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.12 + yaml: 2.5.1 + yargs: 17.7.2 + dev: true + /@typespec/compiler/0.62.0: resolution: {integrity: sha512-RfKJ/rF2Wjxu7dl74oJE8yEfSkeL7NopFlyJ4dW1JQXpRN2IOJYPxas12qZA6H9ZEIB8rBjyrHNxJSQbvn/UDQ==} engines: {node: '>=18.0.0'} @@ -2422,6 +2505,19 @@ packages: yaml: 2.5.1 yargs: 17.7.2 + /@typespec/http/0.61.0_@typespec+compiler@0.61.2: + resolution: {integrity: sha512-7+AYHkzkc+p652GY9BcEbXY4OZa1fTr03MVmZeafvmbQbXfyzUU9eJld13M3v6NaUWqXWZ7nBNMISyKiXp/kSw==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.61.0 + '@typespec/streams': ~0.61.0 + peerDependenciesMeta: + '@typespec/streams': + optional: true + dependencies: + '@typespec/compiler': 0.61.2 + dev: true + /@typespec/http/0.62.0_@typespec+compiler@0.62.0: resolution: {integrity: sha512-6H9y9e32lb2s76MMy29ITCwSZNG42sa/qWthiByUvfbTEXMpu5a1fQHNj7RXg+xmDKmVIHv3gAfjGPAWfXhkaQ==} engines: {node: '>=18.0.0'} @@ -2468,6 +2564,17 @@ packages: - openapi-types dev: false + /@typespec/rest/0.61.0_rd6g2np7ypwc24nhrvozahtdfy: + resolution: {integrity: sha512-L9Oyor+l42p6S8GE+UvaZTi+dcu6WubGZKmaBRpX8mCZGsa69EgIK8DQoyxrfMcxAO4I5U0sfkzCKwCVFtRr9g==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.61.0 + '@typespec/http': ~0.61.0 + dependencies: + '@typespec/compiler': 0.61.2 + '@typespec/http': 0.61.0_@typespec+compiler@0.61.2 + dev: true + /@typespec/rest/0.62.0_ehpjn7t5lr2snllrxt4bmumehe: resolution: {integrity: sha512-ci5UjelEKFwsPTdpgysoUoDCcw02EnbG4GBuYJdR5mRrFCBZMxrbro+OJLgSN3g/TORSsWlW7dEOWLfbyrmlZQ==} engines: {node: '>=18.0.0'} @@ -2497,11 +2604,11 @@ packages: dependencies: '@typespec/compiler': 0.62.0 - /@typespec/xml/0.62.0_@typespec+compiler@0.62.0: - resolution: {integrity: sha512-DexGTQHB75fncDcYfs5CIbNwO6NOhjwCaaNoHYAsVVzs4T8qwzw6WQdEEMzZRbgsxwnllFkxKwGhLtRMQdv/cQ==} + /@typespec/xml/0.61.0_@typespec+compiler@0.62.0: + resolution: {integrity: sha512-LnMYyzB7f6C8rBZmQwhKyJOJ8mUTFls6aVKXw4EAaO2+HPsm73GN16lj1bt2ffbWR3izCGnz911K2wGtUrtSpA==} engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.62.0 + '@typespec/compiler': ~0.61.0 dependencies: '@typespec/compiler': 0.62.0 dev: true diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index 80e3e1941b..03c3ef61bf 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -64,7 +64,7 @@ "devDependencies": { "@azure-rest/core-client": "^2.3.1", "@azure-tools/cadl-ranch-expect": "^0.15.6", - "@azure-tools/cadl-ranch-specs": "^0.39.1", + "@azure-tools/cadl-ranch-specs": "^0.38.0", "@azure-tools/cadl-ranch": "^0.16.1", "@azure-tools/cadl-ranch-api": "^0.5.0", "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0", From ce2e07c996844f332ea6d642de434ad6684681bd Mon Sep 17 00:00:00 2001 From: Mary Gao Date: Mon, 11 Nov 2024 20:01:49 +0800 Subject: [PATCH 16/16] Revert cadl-ranch version --- common/config/rush/pnpm-lock.yaml | 45 +++---------------------------- packages/typespec-ts/package.json | 4 +-- 2 files changed, 5 insertions(+), 44 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 7ca8c00942..fdf161c3e5 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -231,9 +231,9 @@ importers: ../../packages/typespec-ts: specifiers: '@azure-rest/core-client': ^2.3.1 - '@azure-tools/cadl-ranch': ^0.16.1 + '@azure-tools/cadl-ranch': ^0.15.0 '@azure-tools/cadl-ranch-api': ^0.5.0 - '@azure-tools/cadl-ranch-expect': ^0.15.6 + '@azure-tools/cadl-ranch-expect': ^0.15.5 '@azure-tools/cadl-ranch-specs': ^0.38.0 '@azure-tools/rlc-common': workspace:^0.34.0 '@azure-tools/typespec-autorest': '>=0.48.0 <1.0.0' @@ -290,7 +290,7 @@ importers: tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 2.3.1 - '@azure-tools/cadl-ranch': 0.16.1_maorf56vredk4k7ivyf3kw4p7i + '@azure-tools/cadl-ranch': 0.15.0_maorf56vredk4k7ivyf3kw4p7i '@azure-tools/cadl-ranch-api': 0.5.0 '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y '@azure-tools/cadl-ranch-specs': 0.38.0_uv4m3qq5ivkac27hpehot5vivy @@ -539,45 +539,6 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch/0.16.1_maorf56vredk4k7ivyf3kw4p7i: - resolution: {integrity: sha512-4tyd+2GDsZjkcsiB14T2m5imkPCokJkFLKrPe0mINb5Z6DVVzk/2BkhId//zk9KinpYL0ThG9ewM1ZeJ0jnoeg==} - engines: {node: '>=16.0.0'} - hasBin: true - dependencies: - '@azure-tools/cadl-ranch-api': 0.5.0 - '@azure-tools/cadl-ranch-coverage-sdk': 0.9.0 - '@azure-tools/cadl-ranch-expect': 0.15.6_f5giq3reeireto67b6daw62k5y - '@azure/identity': 4.4.1 - '@types/js-yaml': 4.0.6 - '@typespec/compiler': 0.62.0 - '@typespec/http': 0.62.0_@typespec+compiler@0.62.0 - '@typespec/rest': 0.62.0_ehpjn7t5lr2snllrxt4bmumehe - ajv: 8.17.1 - axios: 1.7.7 - body-parser: 1.20.3 - deep-equal: 2.2.2 - express: 4.21.1 - express-promise-router: 4.1.1_express@4.21.1 - form-data: 3.0.2 - glob: 11.0.0 - jackspeak: 4.0.1 - js-yaml: 4.1.0 - morgan: 1.10.0 - multer: 1.4.5-lts.1 - node-fetch: 3.3.2 - picocolors: 1.1.0 - source-map-support: 0.5.21 - winston: 3.14.1 - xml2js: 0.6.2 - yargs: 17.7.2 - transitivePeerDependencies: - - '@types/express' - - '@typespec/streams' - - '@typespec/versioning' - - debug - - supports-color - dev: true - /@azure-tools/codegen/2.9.2: resolution: {integrity: sha512-brVLyffOtPiEijYYBYgV+4q7IyAfqXIec7XbdEqvv7As6SeEdq5WtbtN9N0LdGVHDWtEfc+JArwIx9aYGFdMUg==} engines: {node: '>=12.0.0'} diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index 03c3ef61bf..7d83b05512 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -63,9 +63,9 @@ "license": "MIT", "devDependencies": { "@azure-rest/core-client": "^2.3.1", - "@azure-tools/cadl-ranch-expect": "^0.15.6", + "@azure-tools/cadl-ranch-expect": "^0.15.5", "@azure-tools/cadl-ranch-specs": "^0.38.0", - "@azure-tools/cadl-ranch": "^0.16.1", + "@azure-tools/cadl-ranch": "^0.15.0", "@azure-tools/cadl-ranch-api": "^0.5.0", "@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0", "@azure-tools/typespec-azure-core": ">=0.48.0 <1.0.0",