From 9e80111d55edcbdf7f7f168a8ce6363a3017c526 Mon Sep 17 00:00:00 2001 From: Qiaoqiao Zhang <55688292+qiaozha@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:25:11 +0800 Subject: [PATCH] bump-compiler-version-0.50.0 (#2140) * bump-compiler-version-0.50.0 * fix ci * fix ci --- common/config/rush/pnpm-lock.yaml | 267 +++++++++++------- packages/typespec-test/package.json | 18 +- .../authoring/generated/openapi/openapi.json | 12 +- .../generated/typespec-ts/src/outputModels.ts | 2 +- .../openapi/2022-11-01-preview/openapi.json | 12 +- .../generated/typespec-ts/src/outputModels.ts | 4 +- packages/typespec-ts/package.json | 12 +- packages/typespec-ts/src/index.ts | 2 +- .../generated/lro/lroCore/src/outputModels.ts | 4 +- packages/typespec-ts/test/util/testUtil.ts | 5 +- 10 files changed, 203 insertions(+), 135 deletions(-) diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 768527b8ca..61af9f7941 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -193,32 +193,32 @@ importers: ../../packages/typespec-test: specifiers: - '@azure-tools/typespec-autorest': '>=0.35.0 <1.0.0' - '@azure-tools/typespec-azure-core': '>=0.35.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.35.0 <1.0.0' + '@azure-tools/typespec-autorest': '>=0.36.1 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.36.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.36.0 <1.0.0' '@azure-tools/typespec-ts': workspace:^0.19.0 '@types/mocha': ^5.2.7 '@types/node': ^18.0.0 - '@typespec/compiler': '>=0.49.0 <1.0.0' - '@typespec/http': '>=0.49.0 <1.0.0' - '@typespec/openapi': '>=0.49.0 <1.0.0' - '@typespec/openapi3': '>=0.49.0 <1.0.0' - '@typespec/rest': '>=0.49.0 <1.0.0' - '@typespec/versioning': '>=0.49.0 <1.0.0' + '@typespec/compiler': '>=0.50.0 <1.0.0' + '@typespec/http': '>=0.50.0 <1.0.0' + '@typespec/openapi': '>=0.50.0 <1.0.0' + '@typespec/openapi3': '>=0.50.0 <1.0.0' + '@typespec/rest': '>=0.50.0 <1.0.0' + '@typespec/versioning': '>=0.50.0 <1.0.0' prettier: 2.7.1 ts-node: ^8.5.2 typescript: ~5.2.0 dependencies: - '@azure-tools/typespec-autorest': 0.35.0_pkfpij76ovuapidkpvq426hebu - '@azure-tools/typespec-azure-core': 0.35.0_l2k6cauhiswc7cyef3ltb45dhy - '@azure-tools/typespec-client-generator-core': 0.35.0_hyg5yyh7beodvmafzqxellnzky + '@azure-tools/typespec-autorest': 0.36.1_jcq3c566tb6ixihddxlygbfdla + '@azure-tools/typespec-azure-core': 0.36.0_kbxqspk7ypiyd7ngrdjpxga3we + '@azure-tools/typespec-client-generator-core': 0.36.0_34oeiyjczsyn4xxwbbzj3xeide '@azure-tools/typespec-ts': link:../typespec-ts - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/openapi': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/openapi3': 0.49.0_kxluj4hvpeoa2fuoepu73vvsjm - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/openapi': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/openapi3': 0.50.0_nvsq2fc4np3qemt42zwtvbv6du + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 prettier: 2.7.1 devDependencies: '@types/mocha': 5.2.7 @@ -233,8 +233,8 @@ importers: '@azure-tools/cadl-ranch-expect': ^0.8.0 '@azure-tools/cadl-ranch-specs': ^0.24.0 '@azure-tools/rlc-common': workspace:^0.19.0 - '@azure-tools/typespec-azure-core': '>=0.35.0 <1.0.0' - '@azure-tools/typespec-client-generator-core': '>=0.35.0 <1.0.0' + '@azure-tools/typespec-azure-core': '>=0.36.0 <1.0.0' + '@azure-tools/typespec-client-generator-core': '>=0.36.0 <1.0.0' '@azure/core-auth': ^1.3.2 '@azure/core-lro': ^2.5.4 '@azure/core-paging': ^1.5.0 @@ -248,11 +248,11 @@ importers: '@types/prettier': ^2.6.0 '@typescript-eslint/eslint-plugin': ^6.8.0 '@typescript-eslint/parser': ^6.8.0 - '@typespec/compiler': '>=0.49.0 <1.0.0' - '@typespec/http': '>=0.49.0 <1.0.0' - '@typespec/rest': '>=0.49.0 <1.0.0' + '@typespec/compiler': '>=0.50.0 <1.0.0' + '@typespec/http': '>=0.50.0 <1.0.0' + '@typespec/rest': '>=0.50.0 <1.0.0' '@typespec/ts-http-runtime': 1.0.0-alpha.20231103.1 - '@typespec/versioning': '>=0.49.0 <1.0.0' + '@typespec/versioning': '>=0.50.0 <1.0.0' chai: ^4.3.6 chalk: ^4.0.0 cross-env: ^7.0.3 @@ -269,21 +269,21 @@ importers: typescript: ~5.2.0 dependencies: '@azure-tools/rlc-common': link:../rlc-common - '@azure-tools/typespec-azure-core': 0.35.0_l2k6cauhiswc7cyef3ltb45dhy - '@azure-tools/typespec-client-generator-core': 0.35.0_hyg5yyh7beodvmafzqxellnzky - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@azure-tools/typespec-azure-core': 0.36.0_kbxqspk7ypiyd7ngrdjpxga3we + '@azure-tools/typespec-client-generator-core': 0.36.0_34oeiyjczsyn4xxwbbzj3xeide + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 fs-extra: 11.1.1 prettier: 2.7.1 ts-morph: 15.1.0 tslib: 2.6.2 devDependencies: '@azure-rest/core-client': 1.1.4 - '@azure-tools/cadl-ranch': 0.9.0_tezp5rjfyokhpujhigtdeqwzp4 - '@azure-tools/cadl-ranch-expect': 0.8.0_hyg5yyh7beodvmafzqxellnzky - '@azure-tools/cadl-ranch-specs': 0.24.0_o47dwcig7y553a2ndtr7sutngq + '@azure-tools/cadl-ranch': 0.9.0_3hgbimueyj4cov2ejjvw37nlra + '@azure-tools/cadl-ranch-expect': 0.8.0_34oeiyjczsyn4xxwbbzj3xeide + '@azure-tools/cadl-ranch-specs': 0.24.0_df5542pgaiepvbqurepfmxhvmq '@azure/core-auth': 1.5.0 '@azure/core-lro': 2.5.4 '@azure/core-paging': 1.5.0 @@ -387,7 +387,7 @@ packages: - supports-color dev: true - /@azure-tools/cadl-ranch-expect/0.8.0_hyg5yyh7beodvmafzqxellnzky: + /@azure-tools/cadl-ranch-expect/0.8.0_2o4u7dqmtsqmr43kn4jhvwjfra: resolution: {integrity: sha512-BjyiGorzaq7ejerrEgK4AiDrBgun5A/Q3U7kEGpK+lpjxON4nHkut07DnDqp3uEvxeHp4yZUIOX9MHd+nDPOPg==} engines: {node: '>=16.0.0'} peerDependencies: @@ -399,10 +399,25 @@ packages: '@typespec/compiler': 0.49.0 '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 + dev: true + + /@azure-tools/cadl-ranch-expect/0.8.0_34oeiyjczsyn4xxwbbzj3xeide: + resolution: {integrity: sha512-BjyiGorzaq7ejerrEgK4AiDrBgun5A/Q3U7kEGpK+lpjxON4nHkut07DnDqp3uEvxeHp4yZUIOX9MHd+nDPOPg==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@typespec/compiler': ~0.49.0 + '@typespec/http': ~0.49.0 + '@typespec/rest': ~0.49.0 + '@typespec/versioning': ~0.49.0 + dependencies: + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 dev: true - /@azure-tools/cadl-ranch-specs/0.24.0_o47dwcig7y553a2ndtr7sutngq: + /@azure-tools/cadl-ranch-specs/0.24.0_df5542pgaiepvbqurepfmxhvmq: resolution: {integrity: sha512-60gcPbnh1JMoE7IGJyXVfX6SRM/X4hE+fHzRc0oe64/GuRJuNS9Xzi8pwOqmoCJDQU1Y2O0y0H0fDHtEJdL6Sg==} engines: {node: '>=16.0.0'} peerDependencies: @@ -413,28 +428,28 @@ packages: '@typespec/rest': ~0.49.0 '@typespec/versioning': ~0.49.0 dependencies: - '@azure-tools/cadl-ranch': 0.9.0_tezp5rjfyokhpujhigtdeqwzp4 + '@azure-tools/cadl-ranch': 0.9.0_3hgbimueyj4cov2ejjvw37nlra '@azure-tools/cadl-ranch-api': 0.4.1 - '@azure-tools/cadl-ranch-expect': 0.8.0_hyg5yyh7beodvmafzqxellnzky - '@azure-tools/typespec-azure-core': 0.35.0_l2k6cauhiswc7cyef3ltb45dhy - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@azure-tools/cadl-ranch-expect': 0.8.0_34oeiyjczsyn4xxwbbzj3xeide + '@azure-tools/typespec-azure-core': 0.36.0_kbxqspk7ypiyd7ngrdjpxga3we + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 transitivePeerDependencies: - '@types/express' - encoding - supports-color dev: true - /@azure-tools/cadl-ranch/0.9.0_tezp5rjfyokhpujhigtdeqwzp4: + /@azure-tools/cadl-ranch/0.9.0_3hgbimueyj4cov2ejjvw37nlra: resolution: {integrity: sha512-EjY+NJ5DprIuVRrpNoTiJANcy5tqHQCRT7KVc3ry1kdQNhEMXV0VVSq8qDhyF60JRbfwMEv97nIpa743yUYW9w==} engines: {node: '>=16.0.0'} hasBin: true dependencies: '@azure-tools/cadl-ranch-api': 0.4.1 '@azure-tools/cadl-ranch-coverage-sdk': 0.4.0 - '@azure-tools/cadl-ranch-expect': 0.8.0_hyg5yyh7beodvmafzqxellnzky + '@azure-tools/cadl-ranch-expect': 0.8.0_2o4u7dqmtsqmr43kn4jhvwjfra '@azure/identity': 3.3.0 '@types/js-yaml': 4.0.6 '@typespec/compiler': 0.49.0 @@ -488,50 +503,50 @@ packages: - supports-color dev: true - /@azure-tools/typespec-autorest/0.35.0_pkfpij76ovuapidkpvq426hebu: - resolution: {integrity: sha512-UGiRhgyBc3WWEUgIsSaT44Jgbw6KD2DwYNDr6Oxl2Ig/8ZIInpIB5Eix7mgdqKoN6ifra1wLn0GDAltwVx+idQ==} - engines: {node: '>=16.0.0'} + /@azure-tools/typespec-autorest/0.36.1_jcq3c566tb6ixihddxlygbfdla: + resolution: {integrity: sha512-huNjjIVVToSfU04ABdlpGJUfA+fI8BsyJP/wAzl3FIJij/vwqMPQp9ioHXlTQGfxmpReyKreDQgCmyCxN5+6aA==} + engines: {node: '>=18.0.0'} peerDependencies: - '@azure-tools/typespec-azure-core': ~0.35.0 - '@typespec/compiler': ~0.49.0 - '@typespec/http': ~0.49.0 - '@typespec/openapi': ~0.49.0 - '@typespec/rest': ~0.49.0 - '@typespec/versioning': ~0.49.0 - dependencies: - '@azure-tools/typespec-azure-core': 0.35.0_l2k6cauhiswc7cyef3ltb45dhy - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/openapi': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@azure-tools/typespec-azure-core': ~0.36.0 + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 + '@typespec/openapi': ~0.50.0 + '@typespec/rest': ~0.50.0 + '@typespec/versioning': ~0.50.0 + dependencies: + '@azure-tools/typespec-azure-core': 0.36.0_kbxqspk7ypiyd7ngrdjpxga3we + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/openapi': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 dev: false - /@azure-tools/typespec-azure-core/0.35.0_l2k6cauhiswc7cyef3ltb45dhy: - resolution: {integrity: sha512-BOzR58O6ZeMcvDD9D1gd9/kZvmJUlyXUiF0BSQUouNVWTlOL9yIMVKZE+zgTiaYm8a3z2uIU9Us6y8CULoWiyw==} - engines: {node: '>=16.0.0'} + /@azure-tools/typespec-azure-core/0.36.0_kbxqspk7ypiyd7ngrdjpxga3we: + resolution: {integrity: sha512-qyUSHJSDM4ftD1Z0nvkk0FrC86vLyYuYrPdi3wQVj+ReJZJts+7l9PVOXor05pfD9GT5ocRINndpGF7jokiqhg==} + engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.49.0 - '@typespec/http': ~0.49.0 - '@typespec/rest': ~0.49.0 + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 + '@typespec/rest': ~0.50.0 dependencies: - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu - /@azure-tools/typespec-client-generator-core/0.35.0_hyg5yyh7beodvmafzqxellnzky: - resolution: {integrity: sha512-3uItmYVhZVmPKCe+s8UZKAubUsjtTbgqVQI4wNayLuAovB9OrWmq09Wq1XEWFHPboGf+4Irehe/feTDnSHA+UA==} - engines: {node: '>=16.0.0'} + /@azure-tools/typespec-client-generator-core/0.36.0_34oeiyjczsyn4xxwbbzj3xeide: + resolution: {integrity: sha512-l3DA2nkU3UqxT8fntIdd4QuUhosyRYNA+Ah1PiMvnNfjzFNjy1pTWiFZI7+P3bYR1MfDFCHAzq52Az371Ulu0w==} + engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.49.0 - '@typespec/http': ~0.49.0 - '@typespec/rest': ~0.49.0 - '@typespec/versioning': ~0.49.0 - dependencies: - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/rest': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 + '@typespec/rest': ~0.50.0 + '@typespec/versioning': ~0.50.0 + dependencies: + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/rest': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 dev: false /@azure/abort-controller/1.1.0: @@ -1357,6 +1372,26 @@ packages: vscode-languageserver-textdocument: 1.0.8 yaml: 2.3.2 yargs: 17.7.2 + dev: true + + /@typespec/compiler/0.50.0: + resolution: {integrity: sha512-CLNPxyGahfdxPPvtHdexwFXCPzfjeN7qjCiRjJmUeJV2Qd+nf8Sps+mwyqflw1v7q1GTpgB9kURMsWV/+NgTdw==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + '@babel/code-frame': 7.22.13 + ajv: 8.12.0 + change-case: 4.1.2 + globby: 13.2.2 + mustache: 4.2.0 + picocolors: 1.0.0 + prettier: 3.0.3 + prompts: 2.4.2 + semver: 7.5.4 + vscode-languageserver: 9.0.1 + vscode-languageserver-textdocument: 1.0.8 + yaml: 2.3.2 + yargs: 17.7.2 /@typespec/http/0.49.0_@typespec+compiler@0.49.0: resolution: {integrity: sha512-MvDJ0s7CjeA/nmutQ4PSTYOj0Gy+78PNd/xe4W5II5w4Kb32Q1vT/oWI2bVZ9G5MkTugKK9P6jmfzwY7EiHksg==} @@ -1365,31 +1400,40 @@ packages: '@typespec/compiler': ~0.49.0 dependencies: '@typespec/compiler': 0.49.0 + dev: true - /@typespec/openapi/0.49.0_eeytn2g3ek3zpawg2doqsgnp3y: - resolution: {integrity: sha512-2TQfnGKtiiKYD1eMiRAcEwDByaBf5WgvcIlLWpWJk/nmcKr6ZeOzUDj5V1fGiiY+/1sI0C0qGCz8PIxcvLa9kw==} - engines: {node: '>=16.0.0'} + /@typespec/http/0.50.0_@typespec+compiler@0.50.0: + resolution: {integrity: sha512-kTRg/TXo2Pn2qZZ/xvjBuA75w3zLk6MIcLMEqQhXDRVhpVCSqPStReZtKBV/YCJ1DvMVnu3mcA7+HqQ4PxrZhQ==} + engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.49.0 - '@typespec/http': ~0.49.0 + '@typespec/compiler': ~0.50.0 dependencies: - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - dev: false + '@typespec/compiler': 0.50.0 - /@typespec/openapi3/0.49.0_kxluj4hvpeoa2fuoepu73vvsjm: - resolution: {integrity: sha512-oim7MoDT6YzgYoFoTwppq4bUKkrq2w7BkMSuUDBniFDfW31W7aEkkIJYj6Q5S8dU3w0wQPkUQZVtJZjKjGPrdw==} - engines: {node: '>=16.0.0'} + /@typespec/openapi/0.50.0_bd5gaxunkvodklitr22kuzoinu: + resolution: {integrity: sha512-aOg3y4XxRl6bI/DR+OR1GFZD+1s9ygH0Z8jarHc3wSNnh4gLmAZ8RYmPFPzwULhvck/EYw+P9R0kcYpX8iC+Lw==} + engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.49.0 - '@typespec/http': ~0.49.0 - '@typespec/openapi': ~0.49.0 - '@typespec/versioning': ~0.49.0 + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 dependencies: - '@typespec/compiler': 0.49.0 - '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 - '@typespec/openapi': 0.49.0_eeytn2g3ek3zpawg2doqsgnp3y - '@typespec/versioning': 0.49.0_@typespec+compiler@0.49.0 + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + dev: false + + /@typespec/openapi3/0.50.0_nvsq2fc4np3qemt42zwtvbv6du: + resolution: {integrity: sha512-R3YOEpRZoABrTrglLClesknhsl1AqXRt0lzZLttATal6w4V0XTGFsc3gyD0muoUTy1e1vPfQixpUTY2CHFqIQA==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 + '@typespec/openapi': ~0.50.0 + '@typespec/versioning': ~0.50.0 + dependencies: + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 + '@typespec/openapi': 0.50.0_bd5gaxunkvodklitr22kuzoinu + '@typespec/versioning': 0.50.0_@typespec+compiler@0.50.0 yaml: 2.3.2 dev: false @@ -1402,6 +1446,17 @@ packages: dependencies: '@typespec/compiler': 0.49.0 '@typespec/http': 0.49.0_@typespec+compiler@0.49.0 + dev: true + + /@typespec/rest/0.50.0_bd5gaxunkvodklitr22kuzoinu: + resolution: {integrity: sha512-nkFfPh4z9z2a46f6HgjuZM7e2+k5bgPDshuwQjjo82mEuSqrMUaeaUs5nx63L2FmacvIvhAvRrd3f8kMpBD5vw==} + engines: {node: '>=18.0.0'} + peerDependencies: + '@typespec/compiler': ~0.50.0 + '@typespec/http': ~0.50.0 + dependencies: + '@typespec/compiler': 0.50.0 + '@typespec/http': 0.50.0_@typespec+compiler@0.50.0 /@typespec/ts-http-runtime/1.0.0-alpha.20231103.1: resolution: {integrity: sha512-ouAAPny3OHIVcC44YfevSH08etbBvg+v6tMBJZMHX1YR2FT0tKBRb4PU47OdEmH74u7JXyccXlZhEENA38RRCw==} @@ -1415,13 +1470,13 @@ packages: - supports-color dev: true - /@typespec/versioning/0.49.0_@typespec+compiler@0.49.0: - resolution: {integrity: sha512-SuRcEB0yaD/wPwaXweIRr+lNDB4hgZwFxHi84y7De1xlntutRl+NeRgWd+K4yVS6tpyNHzcqK6Z7bBD30yQK/w==} - engines: {node: '>=16.0.0'} + /@typespec/versioning/0.50.0_@typespec+compiler@0.50.0: + resolution: {integrity: sha512-lEJUBMFqhLWTL2eqnOEwFSnopWs06YmS6Fo3SI3UtGHiTU2EneWHk+BnhSplbOmFEQ7XTVlj0QxZ4/TaE0GgPw==} + engines: {node: '>=18.0.0'} peerDependencies: - '@typespec/compiler': ~0.49.0 + '@typespec/compiler': ~0.50.0 dependencies: - '@typespec/compiler': 0.49.0 + '@typespec/compiler': 0.50.0 /@ungap/promise-all-settled/1.1.2: resolution: {integrity: sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==} diff --git a/packages/typespec-test/package.json b/packages/typespec-test/package.json index a882516728..44faa4c87f 100644 --- a/packages/typespec-test/package.json +++ b/packages/typespec-test/package.json @@ -4,15 +4,15 @@ "type": "module", "dependencies": { "@azure-tools/typespec-ts": "workspace:^0.19.0", - "@typespec/openapi": ">=0.49.0 <1.0.0", - "@azure-tools/typespec-autorest": ">=0.35.0 <1.0.0", - "@typespec/openapi3": ">=0.49.0 <1.0.0", - "@azure-tools/typespec-azure-core": ">=0.35.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.35.0 <1.0.0", - "@typespec/compiler": ">=0.49.0 <1.0.0", - "@typespec/http": ">=0.49.0 <1.0.0", - "@typespec/rest": ">=0.49.0 <1.0.0", - "@typespec/versioning": ">=0.49.0 <1.0.0", + "@typespec/openapi": ">=0.50.0 <1.0.0", + "@azure-tools/typespec-autorest": ">=0.36.1 <1.0.0", + "@typespec/openapi3": ">=0.50.0 <1.0.0", + "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.36.0 <1.0.0", + "@typespec/compiler": ">=0.50.0 <1.0.0", + "@typespec/http": ">=0.50.0 <1.0.0", + "@typespec/rest": ">=0.50.0 <1.0.0", + "@typespec/versioning": ">=0.50.0 <1.0.0", "prettier": "2.7.1" }, "devDependencies": { diff --git a/packages/typespec-test/test/authoring/generated/openapi/openapi.json b/packages/typespec-test/test/authoring/generated/openapi/openapi.json index ab49458b7f..0ef6304ce9 100644 --- a/packages/typespec-test/test/authoring/generated/openapi/openapi.json +++ b/packages/typespec-test/test/authoring/generated/openapi/openapi.json @@ -922,7 +922,8 @@ "type": "string", "description": "Enum describing allowed operation states.", "enum": [ - "InProgress", + "NotStarted", + "Running", "Succeeded", "Failed", "Canceled" @@ -932,8 +933,13 @@ "modelAsString": true, "values": [ { - "name": "InProgress", - "value": "InProgress", + "name": "NotStarted", + "value": "NotStarted", + "description": "The operation has not started." + }, + { + "name": "Running", + "value": "Running", "description": "The operation is in progress." }, { diff --git a/packages/typespec-test/test/authoring/generated/typespec-ts/src/outputModels.ts b/packages/typespec-test/test/authoring/generated/typespec-ts/src/outputModels.ts index 6f37cf2ce2..c4c4393299 100644 --- a/packages/typespec-test/test/authoring/generated/typespec-ts/src/outputModels.ts +++ b/packages/typespec-test/test/authoring/generated/typespec-ts/src/outputModels.ts @@ -43,7 +43,7 @@ export interface OperationStatusOutput { /** * The status of the operation * - * Possible values: InProgress, Succeeded, Failed, Canceled + * Possible values: NotStarted, Running, Succeeded, Failed, Canceled */ status: string; /** Error object that describes the error when status is "Failed". */ diff --git a/packages/typespec-test/test/contoso/generated/openapi/2022-11-01-preview/openapi.json b/packages/typespec-test/test/contoso/generated/openapi/2022-11-01-preview/openapi.json index fd7bed4766..6e6d50850d 100644 --- a/packages/typespec-test/test/contoso/generated/openapi/2022-11-01-preview/openapi.json +++ b/packages/typespec-test/test/contoso/generated/openapi/2022-11-01-preview/openapi.json @@ -359,7 +359,8 @@ "type": "string", "description": "Enum describing allowed operation states.", "enum": [ - "InProgress", + "NotStarted", + "Running", "Succeeded", "Failed", "Canceled" @@ -369,8 +370,13 @@ "modelAsString": true, "values": [ { - "name": "InProgress", - "value": "InProgress", + "name": "NotStarted", + "value": "NotStarted", + "description": "The operation has not started." + }, + { + "name": "Running", + "value": "Running", "description": "The operation is in progress." }, { diff --git a/packages/typespec-test/test/contoso/generated/typespec-ts/src/outputModels.ts b/packages/typespec-test/test/contoso/generated/typespec-ts/src/outputModels.ts index c824f257d6..8f645fed04 100644 --- a/packages/typespec-test/test/contoso/generated/typespec-ts/src/outputModels.ts +++ b/packages/typespec-test/test/contoso/generated/typespec-ts/src/outputModels.ts @@ -29,7 +29,7 @@ export interface ResourceOperationStatusOutput { /** * The status of the operation * - * Possible values: InProgress, Succeeded, Failed, Canceled + * Possible values: NotStarted, Running, Succeeded, Failed, Canceled */ status: string; /** Error object that describes the error when status is "Failed". */ @@ -45,7 +45,7 @@ export interface OperationStatusOutput { /** * The status of the operation * - * Possible values: InProgress, Succeeded, Failed, Canceled + * Possible values: NotStarted, Running, Succeeded, Failed, Canceled */ status: string; /** Error object that describes the error when status is "Failed". */ diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json index 4e93b80185..c520caafc1 100644 --- a/packages/typespec-ts/package.json +++ b/packages/typespec-ts/package.json @@ -74,12 +74,12 @@ "@typespec/ts-http-runtime": "1.0.0-alpha.20231103.1" }, "peerDependencies": { - "@azure-tools/typespec-azure-core": ">=0.35.0 <1.0.0", - "@azure-tools/typespec-client-generator-core": ">=0.35.0 <1.0.0", - "@typespec/compiler": ">=0.49.0 <1.0.0", - "@typespec/http": ">=0.49.0 <1.0.0", - "@typespec/rest": ">=0.49.0 <1.0.0", - "@typespec/versioning": ">=0.49.0 <1.0.0" + "@azure-tools/typespec-azure-core": ">=0.36.0 <1.0.0", + "@azure-tools/typespec-client-generator-core": ">=0.36.0 <1.0.0", + "@typespec/compiler": ">=0.50.0 <1.0.0", + "@typespec/http": ">=0.50.0 <1.0.0", + "@typespec/rest": ">=0.50.0 <1.0.0", + "@typespec/versioning": ">=0.50.0 <1.0.0" }, "dependencies": { "prettier": "^2.6.1", diff --git a/packages/typespec-ts/src/index.ts b/packages/typespec-ts/src/index.ts index d7479edac9..264754354f 100644 --- a/packages/typespec-ts/src/index.ts +++ b/packages/typespec-ts/src/index.ts @@ -61,7 +61,7 @@ export async function $onEmit(context: EmitContext) { /** Shared status */ const program: Program = context.program; const emitterOptions: RLCOptions = context.options; - const dpgContext = createSdkContext(context) as SdkContext; + const dpgContext = createSdkContext(context, "@azure-tools/typespec-ts") as SdkContext; const needUnexpectedHelper: Map = new Map(); const serviceNameToRlcModelsMap: Map = new Map< string, diff --git a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/outputModels.ts b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/outputModels.ts index 5de7e44025..73a9718ebf 100644 --- a/packages/typespec-ts/test/integration/generated/lro/lroCore/src/outputModels.ts +++ b/packages/typespec-ts/test/integration/generated/lro/lroCore/src/outputModels.ts @@ -18,7 +18,7 @@ export interface OperationStatusOutput { /** * The status of the operation * - * Possible values: InProgress, Succeeded, Failed, Canceled + * Possible values: NotStarted, Running, Succeeded, Failed, Canceled */ status: string; /** Error object that describes the error when status is "Failed". */ @@ -32,7 +32,7 @@ export interface ResourceOperationStatusOutput { /** * The status of the operation * - * Possible values: InProgress, Succeeded, Failed, Canceled + * Possible values: NotStarted, Running, Succeeded, Failed, Canceled */ status: string; /** Error object that describes the error when status is "Failed". */ diff --git a/packages/typespec-ts/test/util/testUtil.ts b/packages/typespec-ts/test/util/testUtil.ts index be23928445..63158cceed 100644 --- a/packages/typespec-ts/test/util/testUtil.ts +++ b/packages/typespec-ts/test/util/testUtil.ts @@ -76,7 +76,7 @@ export function createDpgContextTestHelper(program: Program): SdkContext { main: "@azure-tools/typespec-ts", metadata: { name: "@azure-tools/typespec-ts" } } - ] + ], }; const resolvedOptions = { ...defaultOptions }; program.emitters = resolvedOptions.emitters as any; @@ -85,7 +85,8 @@ export function createDpgContextTestHelper(program: Program): SdkContext { generateProtocolMethods: resolvedOptions.generateProtocolMethods, generateConvenienceMethods: resolvedOptions.generateConvenienceMethods, rlcOptions: {}, - generationPathDetail: {} + generationPathDetail: {}, + emitterName: "@azure-tools/typespec-ts" } as SdkContext; }