From 65776e84950982df11a76cd9fd35731284817a53 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Tue, 31 Jan 2023 15:44:37 +0800 Subject: [PATCH 1/9] upgrade cadl to 0.39 --- package-lock.json | 1929 ++++++++++------- .../Emitter.Csharp/package.json | 18 +- .../test/TestProjects/lro/Generated/cadl.json | 81 +- .../test/TestProjects/lro/lro.cadl | 1 + test/CadlRanchMockApis/package.json | 2 +- .../Authoring-Cadl/Authoring-Cadl.cadl | 4 + .../Generated/AuthoringClient.cs | 62 +- .../Generated/Docs/AuthoringClient.xml | 80 +- .../Generated/Models/DeploymentJob.cs | 7 +- .../Generated/Models/SwapDeploymentsJob.cs | 7 +- .../Authoring-Cadl/Generated/cadl.json | 579 +++-- .../Generated/LroBasicCadlClient.cs | 40 +- .../Lro-Basic-Cadl/Generated/cadl.json | 16 +- .../Generated/Docs/MixApiVersionClient.xml | 4 - .../MixAPIVersion-Cadl/Generated/cadl.json | 56 +- .../MixAPIVersion-Cadl.cadl | 2 + .../Models/BaseModel.Serialization.cs | 17 - .../Models/DerivedModel.Serialization.cs | 2 +- .../Models/RoundTripModel.Serialization.cs | 2 +- .../RoundTripPrimitiveModel.Serialization.cs | 2 +- .../Models-Cadl/Generated/cadl.json | 2 +- .../Generated/Docs/RenameGetListClient.xml | 40 +- .../Generated/RenameGetListClient.cs | 38 +- .../RenameGetList-Cadl/Generated/cadl.json | 176 +- .../RenameGetList-Cadl.cadl | 2 + 25 files changed, 1627 insertions(+), 1542 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6bd8fd5bf57..51556ddec33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,35 +32,35 @@ "dev": true }, "node_modules/@azure-tools/cadl-autorest": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.24.0.tgz", - "integrity": "sha512-q8A3GRlwyQJ+/8cJs3dzyB4sRSVORItVS27NOraOwaXMudk9W6wW4uwBpyR07B3iHUanC8ZECe6CaCDUUttbtg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.25.0.tgz", + "integrity": "sha512-4i4siT4uDVm64gCDcuzDT8xikC2XPCMp4k+NWwPBF2v39IUZkDTtvqSWqRKXhpEVRZcTKbTlJLamfzWGfvdBtg==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/cadl-azure-core": "~0.24.0", - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/openapi": "~0.38.0", - "@cadl-lang/rest": "~0.38.0", - "@cadl-lang/versioning": "~0.38.0" + "@azure-tools/cadl-azure-core": "~0.25.0", + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/openapi": "~0.39.0", + "@cadl-lang/rest": "~0.39.0", + "@cadl-lang/versioning": "~0.39.0" } }, "node_modules/@azure-tools/cadl-azure-core": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.24.0.tgz", - "integrity": "sha512-Pzs1uC03Rbd783dAN8yvsFEWKJIBpV7zKf+Mj2S2x7F9IsR+KS1nlPmifIAtSCeSRPVkU21xD1WmzXvB1GR59w==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.25.0.tgz", + "integrity": "sha512-V3yhJ9mUKntAt2AVm4f/sR91H/wWD8CMLUPQm2GwgSe/Fkv9fc4qE6qnE4QUxPGYJUgYeDXYv12qRN2eLId9sA==", "dev": true, "dependencies": { - "@cadl-lang/lint": "~0.38.0" + "@cadl-lang/lint": "~0.39.0" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0" } }, "node_modules/@azure-tools/cadl-csharp": { @@ -68,30 +68,30 @@ "link": true }, "node_modules/@azure-tools/cadl-dpg": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.24.0.tgz", - "integrity": "sha512-9tjkQywJKAHyTwWH5lxvd4w4De1DpEW10uTm4WM12glwef3ZIDE/fUl/yizYA8+kYle5YLTsAVXo0pKYCQWnOg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.25.0.tgz", + "integrity": "sha512-T4txhl86WH4se3gklRBNBmy81w7C1fY/fkuRLQGgycBqZ1BEOkn7UpExh90alrGs7eNT8YzWcgh9lO1HWn1BQA==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0" } }, "node_modules/@azure-tools/cadl-ranch": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.2.11.tgz", - "integrity": "sha512-SvmXIKZqi+5bvP062alnlwwmz0/L81haPlfJWh9Nrwv/IEOHJ5YpzuITXyXLnoNf6LNfC1bWJ7JsHH73DR+gYA==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.2.15.tgz", + "integrity": "sha512-o2i2I4bsAxQY4mDpgvgDTdxi8dQehpzFYiXIMLPtDeONJcsSsOdYsy1Z2c9XdY8QTQk+w3NWMvDyRP/HW1Shwg==", "dev": true, "dependencies": { - "@azure-tools/cadl-ranch-api": "~0.1.10", - "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.3", - "@azure-tools/cadl-ranch-expect": "~0.1.13", + "@azure-tools/cadl-ranch-api": "~0.1.11", + "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.4", + "@azure-tools/cadl-ranch-expect": "~0.1.15", "@azure/identity": "^3.0.0", - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0", + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0", "@types/js-yaml": "^4.0.5", "ajv": "8.11.0", "body-parser": "^1.20.0", @@ -117,9 +117,9 @@ } }, "node_modules/@azure-tools/cadl-ranch-api": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.10.tgz", - "integrity": "sha512-elg/nBbkWDW8USe9O39dsg8tpeBuZHjKt5jBT3cf3Qn47OzXFky/SWx7p6/baJdZAZBxHoW0fSqFZIuyKx185Q==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.11.tgz", + "integrity": "sha512-aHHEhI77jhB9fzIaa89bPisMcKJsrFV4JDRs09m2cecv0NBMH7mq+lU75OPg19uscX4aA3xHZxGcM5JdWF4TJw==", "dev": true, "dependencies": { "body-parser": "^1.20.0", @@ -146,9 +146,9 @@ } }, "node_modules/@azure-tools/cadl-ranch-api/node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -165,9 +165,9 @@ } }, "node_modules/@azure-tools/cadl-ranch-api/node_modules/minimatch": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz", - "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -177,9 +177,9 @@ } }, "node_modules/@azure-tools/cadl-ranch-coverage-sdk": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.3.tgz", - "integrity": "sha512-SWalQY0bkyZU1P7DlhDb4YeU3jkEGlJRCpocuVYtTBe/d37uegHgnXKQ8zwZZW/0NoLBsaKV2sK4Jbsbk2BhFg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.4.tgz", + "integrity": "sha512-m66CD/VqnMqx0CEj2zKBIrqSSBiiZxhiQ2ohgCIxGZpcxmW/rF31KBLg4nLfHez/AK1xxVLzEAZoWHLFe7iWHQ==", "dev": true, "dependencies": { "@azure/identity": "^3.0.0", @@ -191,16 +191,16 @@ } }, "node_modules/@azure-tools/cadl-ranch-expect": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.13.tgz", - "integrity": "sha512-ucv9eDQZ31X9lsuI/C3prd87aL3WxH7rB/6JHYQq90hvTcVI26VMjgkZaXcWOuYgcsV41CiNbe+H5EQcg//C6A==", + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.15.tgz", + "integrity": "sha512-QS9kOUtwmhkkXJ8N+drmC09t2u9xXZS8vr8NFMbNDLb9l6z6n2XXA3FgCuuREUN0J6lKi3J0Qgu3OpaBoq4/GQ==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0" } }, "node_modules/@azure-tools/cadl-ranch-mockapis": { @@ -208,23 +208,23 @@ "link": true }, "node_modules/@azure-tools/cadl-ranch-specs": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.6.0.tgz", - "integrity": "sha512-SlJTZ81gtC6PUavz6M165iBAN4JLuno3Wbzv6ccjUqRyiriaY7/rfijl+LpRTG1IyO5+9L6QCgQ9yzIgqd6vXg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.6.6.tgz", + "integrity": "sha512-cqP5JvisH8IgGQ+/Qprwj4h0AY+SX7kPPY0ynhHB5h8RrGdg+oFD9n9xgVw+Ka/9k8Jgf/hhZLRltzUPtZkoBQ==", "dev": true, "dependencies": { - "@azure-tools/cadl-ranch": "~0.2.11", - "@azure-tools/cadl-ranch-api": "~0.1.10" + "@azure-tools/cadl-ranch": "~0.2.15", + "@azure-tools/cadl-ranch-api": "~0.1.11" }, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@azure-tools/cadl-azure-core": "~0.24.0", - "@azure-tools/cadl-ranch-expect": "~0.1.13", - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0", - "@cadl-lang/versioning": "~0.38.0" + "@azure-tools/cadl-azure-core": "~0.25.0", + "@azure-tools/cadl-ranch-expect": "~0.1.15", + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0", + "@cadl-lang/versioning": "~0.39.0" } }, "node_modules/@azure-tools/cadl-ranch/node_modules/ajv": { @@ -253,9 +253,9 @@ } }, "node_modules/@azure-tools/cadl-ranch/node_modules/glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -278,9 +278,9 @@ "dev": true }, "node_modules/@azure-tools/cadl-ranch/node_modules/minimatch": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz", - "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -315,9 +315,9 @@ } }, "node_modules/@azure/core-client": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz", - "integrity": "sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz", + "integrity": "sha512-fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw==", "dev": true, "dependencies": { "@azure/abort-controller": "^1.0.0", @@ -329,7 +329,7 @@ "tslib": "^2.2.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@azure/core-http": { @@ -386,9 +386,9 @@ } }, "node_modules/@azure/core-http/node_modules/node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", "dev": true, "dependencies": { "whatwg-url": "^5.0.0" @@ -437,9 +437,9 @@ } }, "node_modules/@azure/core-lro": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz", - "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz", + "integrity": "sha512-Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==", "dev": true, "dependencies": { "@azure/abort-controller": "^1.0.0", @@ -447,7 +447,7 @@ "tslib": "^2.2.0" }, "engines": { - "node": ">=12.0.0" + "node": ">=14.0.0" } }, "node_modules/@azure/core-paging": { @@ -463,9 +463,9 @@ } }, "node_modules/@azure/core-rest-pipeline": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.0.tgz", - "integrity": "sha512-m6c4iAalfaf6sytOOQhLKFprEHSkSjQuRgkW7MTMnAN+GENDDL4XZJp7WKFnq9VpKUE+ggq+rp5xX9GI93lumw==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", + "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", "dev": true, "dependencies": { "@azure/abort-controller": "^1.0.0", @@ -578,9 +578,9 @@ } }, "node_modules/@azure/identity": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-3.1.2.tgz", - "integrity": "sha512-UCuxhM3q3ODH62oOChEOS57uMc/CFTtoO7NyrDv0nx9IIfbiAaEVztDLXkpVWLw90Dw+t39MDL+I1MQLOWLT9g==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-3.1.3.tgz", + "integrity": "sha512-y0jFjSfHsVPwXSwi3KaSPtOZtJZqhiqAhWUXfFYBUd/+twUBovZRXspBwLrF5rJe0r5NyvmScpQjL+TYDTQVvw==", "dev": true, "dependencies": { "@azure/abort-controller": "^1.0.0", @@ -590,9 +590,9 @@ "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^2.32.0", - "@azure/msal-common": "^9.0.0", - "@azure/msal-node": "^1.14.4", + "@azure/msal-browser": "^2.32.2", + "@azure/msal-common": "^9.0.2", + "@azure/msal-node": "^1.14.6", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", @@ -626,34 +626,34 @@ } }, "node_modules/@azure/msal-browser": { - "version": "2.32.1", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz", - "integrity": "sha512-2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g==", + "version": "2.32.2", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz", + "integrity": "sha512-1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==", "dev": true, "dependencies": { - "@azure/msal-common": "^9.0.1" + "@azure/msal-common": "^9.0.2" }, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-common": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz", - "integrity": "sha512-eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz", + "integrity": "sha512-we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw==", "dev": true, "engines": { "node": ">=0.8.0" } }, "node_modules/@azure/msal-node": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz", - "integrity": "sha512-NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==", + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz", + "integrity": "sha512-em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==", "dev": true, "dependencies": { - "@azure/msal-common": "^9.0.1", - "jsonwebtoken": "^8.5.1", + "@azure/msal-common": "^9.0.2", + "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "engines": { @@ -714,34 +714,34 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", - "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz", + "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==", "dev": true, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", - "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", + "version": "7.20.12", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", + "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-module-transforms": "^7.20.2", - "@babel/helpers": "^7.20.5", - "@babel/parser": "^7.20.5", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5", + "@babel/generator": "^7.20.7", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-module-transforms": "^7.20.11", + "@babel/helpers": "^7.20.7", + "@babel/parser": "^7.20.7", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.12", + "@babel/types": "^7.20.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", + "json5": "^2.2.2", "semver": "^6.3.0" }, "engines": { @@ -776,12 +776,12 @@ "dev": true }, "node_modules/@babel/generator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", - "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", + "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", "dev": true, "dependencies": { - "@babel/types": "^7.20.5", + "@babel/types": "^7.20.7", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -804,14 +804,15 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", - "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", "dev": true, "dependencies": { - "@babel/compat-data": "^7.20.0", + "@babel/compat-data": "^7.20.5", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", "semver": "^6.3.0" }, "engines": { @@ -868,9 +869,9 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", - "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", + "version": "7.20.11", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", + "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", "dev": true, "dependencies": { "@babel/helper-environment-visitor": "^7.18.9", @@ -878,9 +879,9 @@ "@babel/helper-simple-access": "^7.20.2", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.2" + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.10", + "@babel/types": "^7.20.7" }, "engines": { "node": ">=6.9.0" @@ -947,14 +948,14 @@ } }, "node_modules/@babel/helpers": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", - "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", + "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", "dev": true, "dependencies": { - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.13", + "@babel/types": "^7.20.7" }, "engines": { "node": ">=6.9.0" @@ -1046,9 +1047,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", - "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz", + "integrity": "sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -1220,33 +1221,33 @@ } }, "node_modules/@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", - "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", + "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", "dev": true, "dependencies": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.5", + "@babel/generator": "^7.20.7", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.5", - "@babel/types": "^7.20.5", + "@babel/parser": "^7.20.13", + "@babel/types": "^7.20.7", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1278,9 +1279,9 @@ "dev": true }, "node_modules/@babel/types": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", - "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", + "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", "dev": true, "dependencies": { "@babel/helper-string-parser": "^7.19.4", @@ -1298,9 +1299,9 @@ "dev": true }, "node_modules/@cadl-lang/compiler": { - "version": "0.38.5", - "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.38.5.tgz", - "integrity": "sha512-jd6a8TEp9ApBzekTb39aBPocYrkuqzsQbLTDcc/c6tA47Wmr87463MAXpeB80ziEsr15sccI01j3g63jt5W0Aw==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.39.0.tgz", + "integrity": "sha512-eAEE66PrwmT4QlWjJm8H/YIljI9n7cNDnSIBN1mbfXFLORKauLhkmYfyVvFzCv/SWNJiw+7VwHje23ITJ/tFDA==", "dev": true, "dependencies": { "@babel/code-frame": "~7.18.6", @@ -1313,7 +1314,7 @@ "node-fetch": "3.2.8", "node-watch": "~0.7.1", "picocolors": "~1.0.0", - "prettier": "~2.7.1", + "prettier": "~2.8.1", "prompts": "~2.4.1", "vscode-languageserver": "~8.0.2", "vscode-languageserver-textdocument": "~1.0.1", @@ -1367,21 +1368,6 @@ "url": "https://opencollective.com/node-fetch" } }, - "node_modules/@cadl-lang/compiler/node_modules/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", - "dev": true, - "bin": { - "prettier": "bin-prettier.js" - }, - "engines": { - "node": ">=10.13.0" - }, - "funding": { - "url": "https://github.com/prettier/prettier?sponsor=1" - } - }, "node_modules/@cadl-lang/eslint-config-cadl": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-config-cadl/-/eslint-config-cadl-0.5.0.tgz", @@ -1400,9 +1386,9 @@ } }, "node_modules/@cadl-lang/eslint-plugin": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.38.0.tgz", - "integrity": "sha512-qAW2hU5J49m3Ppj+jZnDlGde9f0t7pRwiVbY1MlgunWvf20fF74p3e66rVKfp9N+lTeuD+rpCYIFvaLbEqcang==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.39.0.tgz", + "integrity": "sha512-TbNbOuWiNABDzkPYQgZK+sa0740U6V9YRwsGn0pdUGHlFkbN/3rQkhyiiEPHfJkQXKrp2Y4gZLGRl0g7MkuDCA==", "dev": true, "dependencies": { "@typescript-eslint/utils": "~5.26.0" @@ -1415,61 +1401,61 @@ } }, "node_modules/@cadl-lang/library-linter": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.38.0.tgz", - "integrity": "sha512-2fIJ+zer9KKJEjER4XvZ07mr+hN3CWPRKrycMknyVRAn2Uc+4iGKP7Tc7OUQ3y/WtQKPrvt0lBDszr+6jO2MKA==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.39.0.tgz", + "integrity": "sha512-omnr7kaF1iSXPlgMG0gQqne531gusjK+PBgAFuy6c4AIAlmDz/h5Xm1Jv95VEIUyAsbvlIhKl5bOZ5+DzzKoHw==", "dev": true, "engines": { "node": ">=14.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0" } }, "node_modules/@cadl-lang/lint": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.38.0.tgz", - "integrity": "sha512-6g4yoXeaNnTYxEWA0QywN3HkTCINPTHI56IsDKp6JhLOiROj1NvoufUzX438vdTqDqNyHg2t08fRmLMJP4GsCQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.39.0.tgz", + "integrity": "sha512-qaWnOYH68ppEDI4jWhPMk6gUIs7t/VYREAjvjniwjc5IYhHPFz5hzFUjmZOAp1az9bxJVwBVtGp1pSB8LFgXCQ==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0" } }, "node_modules/@cadl-lang/openapi": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.38.0.tgz", - "integrity": "sha512-lFmU5AsZtw7Ofcnq3lg18Ieg21iuS73NOb+549BxPZX2j70vEqqfRT3CCCFmpGCK2sAUy2x2qD+pVUBcQIXeHQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.39.0.tgz", + "integrity": "sha512-N/NlryVdaFKzzSdbLeko09M5s2aNEnZsMXHYCMCb9b0HLeJJ/cR/nCulTxCoNO1VMN5VWdSaohBtle4EHS/HSw==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0" } }, "node_modules/@cadl-lang/rest": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.38.0.tgz", - "integrity": "sha512-DvLLoUaG3//nf4HC4BhFFNK8cotYbwtL35cb6Nko8MYruLCuxQn0vZKtAMLnlvZWXc65qfbnTz1W/EI0NQh8+w==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.39.0.tgz", + "integrity": "sha512-KpEpC/kEoeEFT4DpuG6G4kK2kzuQ4sH85P99ched8CLAo2SzWT0WVYEjya1ony+hqKlvm2nrigattX7P1ES8TQ==", "dev": true, "engines": { "node": ">=16.0.0" }, "peerDependencies": { - "@cadl-lang/compiler": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0" } }, "node_modules/@cadl-lang/versioning": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.38.0.tgz", - "integrity": "sha512-7ECvYQShLu80eyQzRgRH1Lu/P1lrjnHpnEcNZK8bVoHoy+QT+DkY/c22OoBRwcb5kux9/T1/CMF61WqfrKC8jQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.39.0.tgz", + "integrity": "sha512-mMmqHTo/Cwssb5Y1qC5Fb4rPkyt7JPK+bWT8KH/oprdG3MOJSemyeEIxQtkId3oBdHZiQHG7T9IN80Dks3GE/A==", "dev": true, "dependencies": { - "@cadl-lang/compiler": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0" }, "engines": { "node": ">=16.0.0" @@ -1496,15 +1482,15 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", - "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^9.4.0", - "globals": "^13.15.0", + "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -1536,9 +1522,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -1569,9 +1555,9 @@ } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.7", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz", - "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==", + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", + "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -2030,9 +2016,9 @@ } }, "node_modules/@opentelemetry/api": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz", - "integrity": "sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz", + "integrity": "sha512-IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g==", "dev": true, "engines": { "node": ">=8.0.0" @@ -2072,13 +2058,13 @@ } }, "node_modules/@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", "dev": true, "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" @@ -2122,9 +2108,9 @@ } }, "node_modules/@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", + "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", "dev": true, "dependencies": { "@types/node": "*" @@ -2173,9 +2159,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.11.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.14.tgz", - "integrity": "sha512-0KXV57tENYmmJMl+FekeW9V3O/rlcqGQQJ/hNh9r8pKIj304pskWuEd8fCyNT86g/TpO0gcOTiLzsHLEURFMIQ==", + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", "dev": true }, "node_modules/@types/node-fetch": { @@ -2195,9 +2181,9 @@ "dev": true }, "node_modules/@types/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", "dev": true }, "node_modules/@types/semver": { @@ -2222,9 +2208,9 @@ } }, "node_modules/@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "version": "16.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz", + "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -2237,14 +2223,14 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz", - "integrity": "sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz", + "integrity": "sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/type-utils": "5.46.1", - "@typescript-eslint/utils": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/type-utils": "5.49.0", + "@typescript-eslint/utils": "5.49.0", "debug": "^4.3.4", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", @@ -2270,16 +2256,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", - "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", + "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" @@ -2312,6 +2298,18 @@ } } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2333,15 +2331,21 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/parser": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.1.tgz", - "integrity": "sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz", + "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "debug": "^4.3.4" }, "engines": { @@ -2384,13 +2388,13 @@ "dev": true }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", - "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz", + "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/visitor-keys": "5.46.1" + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/visitor-keys": "5.49.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2401,13 +2405,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz", - "integrity": "sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz", + "integrity": "sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.46.1", - "@typescript-eslint/utils": "5.46.1", + "@typescript-eslint/typescript-estree": "5.49.0", + "@typescript-eslint/utils": "5.49.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, @@ -2428,16 +2432,16 @@ } }, "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", - "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", + "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" @@ -2470,6 +2474,18 @@ } } }, + "node_modules/@typescript-eslint/type-utils/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/type-utils/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2491,10 +2507,16 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/type-utils/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/types": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", - "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz", + "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -2505,13 +2527,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", - "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz", + "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/visitor-keys": "5.46.1", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/visitor-keys": "5.49.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -2568,6 +2590,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/typescript-estree/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2589,6 +2623,12 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/utils": { "version": "5.26.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz", @@ -2724,6 +2764,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@typescript-eslint/utils/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2745,13 +2797,19 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/utils/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", - "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz", + "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/types": "5.49.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -2788,9 +2846,9 @@ } }, "node_modules/acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true, "bin": { "acorn": "bin/acorn" @@ -3037,9 +3095,9 @@ } }, "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "node_modules/axios": { @@ -3289,9 +3347,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "dev": true, "funding": [ { @@ -3304,10 +3362,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" }, "bin": { "browserslist": "cli.js" @@ -3554,9 +3612,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001439", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz", - "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==", + "version": "1.0.30001449", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz", + "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==", "dev": true, "funding": [ { @@ -3671,10 +3729,16 @@ } }, "node_modules/ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", + "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "engines": { "node": ">=8" } @@ -3859,9 +3923,9 @@ } }, "node_modules/content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, "engines": { "node": ">= 0.6" @@ -3945,9 +4009,9 @@ } }, "node_modules/data-uri-to-buffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", - "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "dev": true, "engines": { "node": ">= 12" @@ -4001,17 +4065,19 @@ "dev": true }, "node_modules/deep-equal": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz", - "integrity": "sha512-2pxgvWu3Alv1PoWEyVg7HS8YhGlUFUV7N5oOvfL6d+7xAmLSemMwv/c8Zv/i9KFzxV5Kt5CAvQc70fLwVuf4UA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz", + "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "es-get-iterator": "^1.1.2", "get-intrinsic": "^1.1.3", "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.1", "is-date-object": "^1.0.5", "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", "isarray": "^2.0.5", "object-is": "^1.1.5", "object-keys": "^1.1.1", @@ -4020,7 +4086,7 @@ "side-channel": "^1.0.4", "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", - "which-typed-array": "^1.1.8" + "which-typed-array": "^1.1.9" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4033,9 +4099,9 @@ "dev": true }, "node_modules/deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz", + "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", "dev": true, "engines": { "node": ">=0.10.0" @@ -4268,19 +4334,20 @@ } }, "node_modules/es-get-iterator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", - "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.0", - "has-symbols": "^1.0.1", - "is-arguments": "^1.1.0", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", "is-map": "^2.0.2", "is-set": "^2.0.2", - "is-string": "^1.0.5", - "isarray": "^2.0.5" + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4333,13 +4400,13 @@ } }, "node_modules/eslint": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", - "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", + "version": "8.33.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", + "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", "dev": true, "dependencies": { - "@eslint/eslintrc": "^1.3.3", - "@humanwhocodes/config-array": "^0.11.6", + "@eslint/eslintrc": "^1.4.1", + "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.10.0", @@ -4358,7 +4425,7 @@ "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.15.0", + "globals": "^13.19.0", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", @@ -4389,9 +4456,9 @@ } }, "node_modules/eslint-config-prettier": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", - "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", + "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", "dev": true, "bin": { "eslint-config-prettier": "bin/cli.js" @@ -4468,6 +4535,18 @@ "eslint": ">=8.8.0" } }, + "node_modules/eslint-plugin-unicorn/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/eslint-plugin-unicorn/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -4483,6 +4562,12 @@ "node": ">=10" } }, + "node_modules/eslint-plugin-unicorn/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -4600,9 +4685,9 @@ } }, "node_modules/eslint/node_modules/globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "dependencies": { "type-fest": "^0.20.2" @@ -4998,9 +5083,9 @@ "dev": true }, "node_modules/fastq": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", - "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, "dependencies": { "reusify": "^1.0.4" @@ -5305,9 +5390,9 @@ } }, "node_modules/get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dev": true, "dependencies": { "function-bind": "^1.1.1", @@ -5742,9 +5827,9 @@ } }, "node_modules/ignore": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", - "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true, "engines": { "node": ">= 4" @@ -5828,6 +5913,20 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "node_modules/internal-slot": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", + "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -5853,6 +5952,20 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-array-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", + "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -5900,9 +6013,9 @@ } }, "node_modules/is-builtin-module": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", - "integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", "dev": true, "dependencies": { "builtin-modules": "^3.3.0" @@ -6095,6 +6208,18 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -6864,6 +6989,18 @@ "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } }, + "node_modules/jest-snapshot/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jest-snapshot/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -6879,6 +7016,12 @@ "node": ">=10" } }, + "node_modules/jest-snapshot/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/jest-util": { "version": "27.5.1", "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.5.1.tgz", @@ -6973,9 +7116,9 @@ } }, "node_modules/js-sdsl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", - "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", + "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", "dev": true, "funding": { "type": "opencollective", @@ -7152,25 +7295,19 @@ ] }, "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", + "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", "dev": true, "dependencies": { "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", + "lodash": "^4.17.21", "ms": "^2.1.1", - "semver": "^5.6.0" + "semver": "^7.3.8" }, "engines": { - "node": ">=4", - "npm": ">=1.4.28" + "node": ">=12", + "npm": ">=6" } }, "node_modules/jsonwebtoken/node_modules/jwa": { @@ -7194,6 +7331,18 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/jsonwebtoken/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/jsonwebtoken/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7201,14 +7350,26 @@ "dev": true }, "node_modules/jsonwebtoken/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, "bin": { - "semver": "bin/semver" + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, + "node_modules/jsonwebtoken/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/jsprim": { "version": "1.4.2", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", @@ -7312,42 +7473,6 @@ "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", "dev": true }, - "node_modules/lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", - "dev": true - }, - "node_modules/lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", - "dev": true - }, - "node_modules/lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", - "dev": true - }, - "node_modules/lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", - "dev": true - }, - "node_modules/lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true - }, - "node_modules/lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", - "dev": true - }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -7360,12 +7485,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true - }, "node_modules/log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -7411,15 +7530,12 @@ } }, "node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" + "yallist": "^3.0.2" } }, "node_modules/make-dir": { @@ -7977,9 +8093,9 @@ "dev": true }, "node_modules/node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz", + "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==", "dev": true }, "node_modules/node-watch": { @@ -8049,9 +8165,9 @@ } }, "node_modules/object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8411,9 +8527,9 @@ } }, "node_modules/prettier": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", - "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -8511,9 +8627,9 @@ "dev": true }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" @@ -8909,9 +9025,9 @@ } }, "node_modules/resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", + "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", "dev": true, "engines": { "node": ">=10" @@ -8995,9 +9111,9 @@ } }, "node_modules/safe-stable-stringify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz", - "integrity": "sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz", + "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==", "dev": true, "engines": { "node": ">=10" @@ -9309,6 +9425,18 @@ "node": ">=0.10.0" } }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/stoppable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", @@ -9516,9 +9644,9 @@ "dev": true }, "node_modules/throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz", + "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==", "dev": true }, "node_modules/tmpl": { @@ -9633,6 +9761,18 @@ } } }, + "node_modules/ts-jest/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/ts-jest/node_modules/semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -9648,10 +9788,16 @@ "node": ">=10" } }, + "node_modules/ts-jest/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", "dev": true }, "node_modules/tsutils": { @@ -9758,9 +9904,9 @@ } }, "node_modules/typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -10328,9 +10474,9 @@ } }, "node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "node_modules/yargs": { @@ -10409,22 +10555,21 @@ } }, "src/CADL.Extension/Emitter.Csharp": { - "name": "@azure-tools/cadl-csharp", "version": "0.1.11", "dev": true, "license": "MIT", "dependencies": { "@autorest/csharp": "3.0.0-beta.20221201.1", - "@azure-tools/cadl-autorest": "0.24.0", - "@azure-tools/cadl-azure-core": "0.24.0", - "@azure-tools/cadl-dpg": "0.24.0", - "@cadl-lang/compiler": "0.38.5", + "@azure-tools/cadl-autorest": "0.25.0", + "@azure-tools/cadl-azure-core": "0.25.0", + "@azure-tools/cadl-dpg": "0.25.0", + "@cadl-lang/compiler": "0.39.0", "@cadl-lang/eslint-config-cadl": "0.5.0", - "@cadl-lang/eslint-plugin": "0.38.0", - "@cadl-lang/library-linter": "0.38.0", - "@cadl-lang/openapi": "0.38.0", - "@cadl-lang/rest": "0.38.0", - "@cadl-lang/versioning": "0.38.0", + "@cadl-lang/eslint-plugin": "0.39.0", + "@cadl-lang/library-linter": "0.39.0", + "@cadl-lang/openapi": "0.39.0", + "@cadl-lang/rest": "0.39.0", + "@cadl-lang/versioning": "0.39.0", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "json-serialize-refs": "^0.1.0-0" @@ -10443,12 +10588,11 @@ } }, "test/CadlRanchMockApis": { - "name": "@azure-tools/cadl-ranch-mockapis", "version": "0.0.1", "dev": true, "license": "MIT", "dependencies": { - "@azure-tools/cadl-ranch-specs": "0.6.0" + "@azure-tools/cadl-ranch-specs": "0.6.6" } } }, @@ -10470,35 +10614,35 @@ "dev": true }, "@azure-tools/cadl-autorest": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.24.0.tgz", - "integrity": "sha512-q8A3GRlwyQJ+/8cJs3dzyB4sRSVORItVS27NOraOwaXMudk9W6wW4uwBpyR07B3iHUanC8ZECe6CaCDUUttbtg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.25.0.tgz", + "integrity": "sha512-4i4siT4uDVm64gCDcuzDT8xikC2XPCMp4k+NWwPBF2v39IUZkDTtvqSWqRKXhpEVRZcTKbTlJLamfzWGfvdBtg==", "dev": true, "requires": {} }, "@azure-tools/cadl-azure-core": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.24.0.tgz", - "integrity": "sha512-Pzs1uC03Rbd783dAN8yvsFEWKJIBpV7zKf+Mj2S2x7F9IsR+KS1nlPmifIAtSCeSRPVkU21xD1WmzXvB1GR59w==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.25.0.tgz", + "integrity": "sha512-V3yhJ9mUKntAt2AVm4f/sR91H/wWD8CMLUPQm2GwgSe/Fkv9fc4qE6qnE4QUxPGYJUgYeDXYv12qRN2eLId9sA==", "dev": true, "requires": { - "@cadl-lang/lint": "~0.38.0" + "@cadl-lang/lint": "~0.39.0" } }, "@azure-tools/cadl-csharp": { "version": "file:src/CADL.Extension/Emitter.Csharp", "requires": { "@autorest/csharp": "3.0.0-beta.20221201.1", - "@azure-tools/cadl-autorest": "0.24.0", - "@azure-tools/cadl-azure-core": "0.24.0", - "@azure-tools/cadl-dpg": "0.24.0", - "@cadl-lang/compiler": "0.38.5", + "@azure-tools/cadl-autorest": "0.25.0", + "@azure-tools/cadl-azure-core": "0.25.0", + "@azure-tools/cadl-dpg": "0.25.0", + "@cadl-lang/compiler": "0.39.0", "@cadl-lang/eslint-config-cadl": "0.5.0", - "@cadl-lang/eslint-plugin": "0.38.0", - "@cadl-lang/library-linter": "0.38.0", - "@cadl-lang/openapi": "0.38.0", - "@cadl-lang/rest": "0.38.0", - "@cadl-lang/versioning": "0.38.0", + "@cadl-lang/eslint-plugin": "0.39.0", + "@cadl-lang/library-linter": "0.39.0", + "@cadl-lang/openapi": "0.39.0", + "@cadl-lang/rest": "0.39.0", + "@cadl-lang/versioning": "0.39.0", "@types/fs-extra": "^9.0.13", "@types/js-yaml": "^4.0.5", "@types/mocha": "~9.1.0", @@ -10515,24 +10659,24 @@ } }, "@azure-tools/cadl-dpg": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.24.0.tgz", - "integrity": "sha512-9tjkQywJKAHyTwWH5lxvd4w4De1DpEW10uTm4WM12glwef3ZIDE/fUl/yizYA8+kYle5YLTsAVXo0pKYCQWnOg==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.25.0.tgz", + "integrity": "sha512-T4txhl86WH4se3gklRBNBmy81w7C1fY/fkuRLQGgycBqZ1BEOkn7UpExh90alrGs7eNT8YzWcgh9lO1HWn1BQA==", "dev": true, "requires": {} }, "@azure-tools/cadl-ranch": { - "version": "0.2.11", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.2.11.tgz", - "integrity": "sha512-SvmXIKZqi+5bvP062alnlwwmz0/L81haPlfJWh9Nrwv/IEOHJ5YpzuITXyXLnoNf6LNfC1bWJ7JsHH73DR+gYA==", + "version": "0.2.15", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.2.15.tgz", + "integrity": "sha512-o2i2I4bsAxQY4mDpgvgDTdxi8dQehpzFYiXIMLPtDeONJcsSsOdYsy1Z2c9XdY8QTQk+w3NWMvDyRP/HW1Shwg==", "dev": true, "requires": { - "@azure-tools/cadl-ranch-api": "~0.1.10", - "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.3", - "@azure-tools/cadl-ranch-expect": "~0.1.13", + "@azure-tools/cadl-ranch-api": "~0.1.11", + "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.4", + "@azure-tools/cadl-ranch-expect": "~0.1.15", "@azure/identity": "^3.0.0", - "@cadl-lang/compiler": "~0.38.0", - "@cadl-lang/rest": "~0.38.0", + "@cadl-lang/compiler": "~0.39.0", + "@cadl-lang/rest": "~0.39.0", "@types/js-yaml": "^4.0.5", "ajv": "8.11.0", "body-parser": "^1.20.0", @@ -10573,9 +10717,9 @@ } }, "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -10592,9 +10736,9 @@ "dev": true }, "minimatch": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz", - "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -10603,9 +10747,9 @@ } }, "@azure-tools/cadl-ranch-api": { - "version": "0.1.10", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.10.tgz", - "integrity": "sha512-elg/nBbkWDW8USe9O39dsg8tpeBuZHjKt5jBT3cf3Qn47OzXFky/SWx7p6/baJdZAZBxHoW0fSqFZIuyKx185Q==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.11.tgz", + "integrity": "sha512-aHHEhI77jhB9fzIaa89bPisMcKJsrFV4JDRs09m2cecv0NBMH7mq+lU75OPg19uscX4aA3xHZxGcM5JdWF4TJw==", "dev": true, "requires": { "body-parser": "^1.20.0", @@ -10629,9 +10773,9 @@ } }, "glob": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz", - "integrity": "sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", + "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", "dev": true, "requires": { "fs.realpath": "^1.0.0", @@ -10642,9 +10786,9 @@ } }, "minimatch": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.1.tgz", - "integrity": "sha512-362NP+zlprccbEt/SkxKfRMHnNY85V74mVnpUpNyr3F35covl09Kec7/sEFLt3RA4oXmewtoaanoIf67SE5Y5g==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, "requires": { "brace-expansion": "^2.0.1" @@ -10653,9 +10797,9 @@ } }, "@azure-tools/cadl-ranch-coverage-sdk": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.3.tgz", - "integrity": "sha512-SWalQY0bkyZU1P7DlhDb4YeU3jkEGlJRCpocuVYtTBe/d37uegHgnXKQ8zwZZW/0NoLBsaKV2sK4Jbsbk2BhFg==", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.4.tgz", + "integrity": "sha512-m66CD/VqnMqx0CEj2zKBIrqSSBiiZxhiQ2ohgCIxGZpcxmW/rF31KBLg4nLfHez/AK1xxVLzEAZoWHLFe7iWHQ==", "dev": true, "requires": { "@azure/identity": "^3.0.0", @@ -10664,26 +10808,26 @@ } }, "@azure-tools/cadl-ranch-expect": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.13.tgz", - "integrity": "sha512-ucv9eDQZ31X9lsuI/C3prd87aL3WxH7rB/6JHYQq90hvTcVI26VMjgkZaXcWOuYgcsV41CiNbe+H5EQcg//C6A==", + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.15.tgz", + "integrity": "sha512-QS9kOUtwmhkkXJ8N+drmC09t2u9xXZS8vr8NFMbNDLb9l6z6n2XXA3FgCuuREUN0J6lKi3J0Qgu3OpaBoq4/GQ==", "dev": true, "requires": {} }, "@azure-tools/cadl-ranch-mockapis": { "version": "file:test/CadlRanchMockApis", "requires": { - "@azure-tools/cadl-ranch-specs": "0.6.0" + "@azure-tools/cadl-ranch-specs": "0.6.6" } }, "@azure-tools/cadl-ranch-specs": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.6.0.tgz", - "integrity": "sha512-SlJTZ81gtC6PUavz6M165iBAN4JLuno3Wbzv6ccjUqRyiriaY7/rfijl+LpRTG1IyO5+9L6QCgQ9yzIgqd6vXg==", + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.6.6.tgz", + "integrity": "sha512-cqP5JvisH8IgGQ+/Qprwj4h0AY+SX7kPPY0ynhHB5h8RrGdg+oFD9n9xgVw+Ka/9k8Jgf/hhZLRltzUPtZkoBQ==", "dev": true, "requires": { - "@azure-tools/cadl-ranch": "~0.2.11", - "@azure-tools/cadl-ranch-api": "~0.1.10" + "@azure-tools/cadl-ranch": "~0.2.15", + "@azure-tools/cadl-ranch-api": "~0.1.11" } }, "@azure/abort-controller": { @@ -10706,9 +10850,9 @@ } }, "@azure/core-client": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz", - "integrity": "sha512-mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.0.tgz", + "integrity": "sha512-fgaLVlF3xGg8JAt7Hl7vkKIJcCAA9NpsvIvb44qaEOW6CaJ+IaHKL7oWe5+oGOVR+y/z2Gd2joyvslqwDvRfTw==", "dev": true, "requires": { "@azure/abort-controller": "^1.0.0", @@ -10765,9 +10909,9 @@ } }, "node-fetch": { - "version": "2.6.7", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", - "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz", + "integrity": "sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==", "dev": true, "requires": { "whatwg-url": "^5.0.0" @@ -10804,9 +10948,9 @@ } }, "@azure/core-lro": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.4.0.tgz", - "integrity": "sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.5.0.tgz", + "integrity": "sha512-Vsd5Sl04RG/p5ui/p0dAFMov5I/W4dmRjOrtWGXVs4vY/hNMPefiFH7cZEOr+1u0XrBKkpvt634IyUUD9bVRuQ==", "dev": true, "requires": { "@azure/abort-controller": "^1.0.0", @@ -10824,9 +10968,9 @@ } }, "@azure/core-rest-pipeline": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.0.tgz", - "integrity": "sha512-m6c4iAalfaf6sytOOQhLKFprEHSkSjQuRgkW7MTMnAN+GENDDL4XZJp7WKFnq9VpKUE+ggq+rp5xX9GI93lumw==", + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz", + "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==", "dev": true, "requires": { "@azure/abort-controller": "^1.0.0", @@ -10912,9 +11056,9 @@ } }, "@azure/identity": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-3.1.2.tgz", - "integrity": "sha512-UCuxhM3q3ODH62oOChEOS57uMc/CFTtoO7NyrDv0nx9IIfbiAaEVztDLXkpVWLw90Dw+t39MDL+I1MQLOWLT9g==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/@azure/identity/-/identity-3.1.3.tgz", + "integrity": "sha512-y0jFjSfHsVPwXSwi3KaSPtOZtJZqhiqAhWUXfFYBUd/+twUBovZRXspBwLrF5rJe0r5NyvmScpQjL+TYDTQVvw==", "dev": true, "requires": { "@azure/abort-controller": "^1.0.0", @@ -10924,9 +11068,9 @@ "@azure/core-tracing": "^1.0.0", "@azure/core-util": "^1.0.0", "@azure/logger": "^1.0.0", - "@azure/msal-browser": "^2.32.0", - "@azure/msal-common": "^9.0.0", - "@azure/msal-node": "^1.14.4", + "@azure/msal-browser": "^2.32.2", + "@azure/msal-common": "^9.0.2", + "@azure/msal-node": "^1.14.6", "events": "^3.0.0", "jws": "^4.0.0", "open": "^8.0.0", @@ -10953,28 +11097,28 @@ } }, "@azure/msal-browser": { - "version": "2.32.1", - "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.1.tgz", - "integrity": "sha512-2G3B12ZEIpiimi6/Yqq7KLk4ud1zZWoHvVd2kJ2VthN1HjMsZjdMUxeHkwMWaQ6RzO6mv9rZiuKmRX64xkXW9g==", + "version": "2.32.2", + "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.32.2.tgz", + "integrity": "sha512-1YqGzXtPG3QrZPFBKaMWr2WQdukDj+PelqUCv351+p+hlw/AhdRrb8haY73/iqkhT6Cdrbnh7sL4gikVsF4O1g==", "dev": true, "requires": { - "@azure/msal-common": "^9.0.1" + "@azure/msal-common": "^9.0.2" } }, "@azure/msal-common": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.0.1.tgz", - "integrity": "sha512-eNNHIW/cwPTZDWs9KtYgb1X6gtQ+cC+FGX2YN+t4AUVsBdUbqlMTnUs6/c/VBxC2AAGIhgLREuNnO3F66AN2zQ==", + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-9.1.1.tgz", + "integrity": "sha512-we9xR8lvu47fF0h+J8KyXoRy9+G/fPzm3QEa2TrdR3jaVS3LKAyE2qyMuUkNdbVkvzl8Zr9f7l+IUSP22HeqXw==", "dev": true }, "@azure/msal-node": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.5.tgz", - "integrity": "sha512-NcVdMfn8Z3ogN+9RjOSF7uwf2Gki5DEJl0BdDSL83KUAgVAobtkZi5W8EqxbJLrTO/ET0jv5DregrcR5qg2pEA==", + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.14.6.tgz", + "integrity": "sha512-em/qqFL5tLMxMPl9vormAs13OgZpmQoJbiQ/GlWr+BA77eCLoL+Ehr5xRHowYo+LFe5b+p+PJVkRvT+mLvOkwA==", "dev": true, "requires": { - "@azure/msal-common": "^9.0.1", - "jsonwebtoken": "^8.5.1", + "@azure/msal-common": "^9.0.2", + "jsonwebtoken": "^9.0.0", "uuid": "^8.3.0" }, "dependencies": { @@ -11024,31 +11168,31 @@ } }, "@babel/compat-data": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.5.tgz", - "integrity": "sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==", + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz", + "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==", "dev": true }, "@babel/core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.5.tgz", - "integrity": "sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==", + "version": "7.20.12", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz", + "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==", "dev": true, "requires": { "@ampproject/remapping": "^2.1.0", "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.5", - "@babel/helper-compilation-targets": "^7.20.0", - "@babel/helper-module-transforms": "^7.20.2", - "@babel/helpers": "^7.20.5", - "@babel/parser": "^7.20.5", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5", + "@babel/generator": "^7.20.7", + "@babel/helper-compilation-targets": "^7.20.7", + "@babel/helper-module-transforms": "^7.20.11", + "@babel/helpers": "^7.20.7", + "@babel/parser": "^7.20.7", + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.12", + "@babel/types": "^7.20.7", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", - "json5": "^2.2.1", + "json5": "^2.2.2", "semver": "^6.3.0" }, "dependencies": { @@ -11070,12 +11214,12 @@ } }, "@babel/generator": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.5.tgz", - "integrity": "sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==", + "version": "7.20.14", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz", + "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==", "dev": true, "requires": { - "@babel/types": "^7.20.5", + "@babel/types": "^7.20.7", "@jridgewell/gen-mapping": "^0.3.2", "jsesc": "^2.5.1" }, @@ -11094,14 +11238,15 @@ } }, "@babel/helper-compilation-targets": { - "version": "7.20.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz", - "integrity": "sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz", + "integrity": "sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==", "dev": true, "requires": { - "@babel/compat-data": "^7.20.0", + "@babel/compat-data": "^7.20.5", "@babel/helper-validator-option": "^7.18.6", "browserslist": "^4.21.3", + "lru-cache": "^5.1.1", "semver": "^6.3.0" } }, @@ -11140,9 +11285,9 @@ } }, "@babel/helper-module-transforms": { - "version": "7.20.2", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz", - "integrity": "sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==", + "version": "7.20.11", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz", + "integrity": "sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==", "dev": true, "requires": { "@babel/helper-environment-visitor": "^7.18.9", @@ -11150,9 +11295,9 @@ "@babel/helper-simple-access": "^7.20.2", "@babel/helper-split-export-declaration": "^7.18.6", "@babel/helper-validator-identifier": "^7.19.1", - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.1", - "@babel/types": "^7.20.2" + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.10", + "@babel/types": "^7.20.7" } }, "@babel/helper-plugin-utils": { @@ -11198,14 +11343,14 @@ "dev": true }, "@babel/helpers": { - "version": "7.20.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.6.tgz", - "integrity": "sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz", + "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==", "dev": true, "requires": { - "@babel/template": "^7.18.10", - "@babel/traverse": "^7.20.5", - "@babel/types": "^7.20.5" + "@babel/template": "^7.20.7", + "@babel/traverse": "^7.20.13", + "@babel/types": "^7.20.7" } }, "@babel/highlight": { @@ -11278,9 +11423,9 @@ } }, "@babel/parser": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.5.tgz", - "integrity": "sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.13.tgz", + "integrity": "sha512-gFDLKMfpiXCsjt4za2JA9oTMn70CeseCehb11kRZgvd7+F67Hih3OHOK24cRrWECJ/ljfPGac6ygXAs/C8kIvw==", "dev": true }, "@babel/plugin-syntax-async-generators": { @@ -11401,30 +11546,30 @@ } }, "@babel/template": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz", - "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz", + "integrity": "sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/parser": "^7.18.10", - "@babel/types": "^7.18.10" + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7" } }, "@babel/traverse": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.5.tgz", - "integrity": "sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==", + "version": "7.20.13", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz", + "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==", "dev": true, "requires": { "@babel/code-frame": "^7.18.6", - "@babel/generator": "^7.20.5", + "@babel/generator": "^7.20.7", "@babel/helper-environment-visitor": "^7.18.9", "@babel/helper-function-name": "^7.19.0", "@babel/helper-hoist-variables": "^7.18.6", "@babel/helper-split-export-declaration": "^7.18.6", - "@babel/parser": "^7.20.5", - "@babel/types": "^7.20.5", + "@babel/parser": "^7.20.13", + "@babel/types": "^7.20.7", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -11447,9 +11592,9 @@ } }, "@babel/types": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.5.tgz", - "integrity": "sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz", + "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==", "dev": true, "requires": { "@babel/helper-string-parser": "^7.19.4", @@ -11464,9 +11609,9 @@ "dev": true }, "@cadl-lang/compiler": { - "version": "0.38.5", - "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.38.5.tgz", - "integrity": "sha512-jd6a8TEp9ApBzekTb39aBPocYrkuqzsQbLTDcc/c6tA47Wmr87463MAXpeB80ziEsr15sccI01j3g63jt5W0Aw==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.39.0.tgz", + "integrity": "sha512-eAEE66PrwmT4QlWjJm8H/YIljI9n7cNDnSIBN1mbfXFLORKauLhkmYfyVvFzCv/SWNJiw+7VwHje23ITJ/tFDA==", "dev": true, "requires": { "@babel/code-frame": "~7.18.6", @@ -11479,7 +11624,7 @@ "node-fetch": "3.2.8", "node-watch": "~0.7.1", "picocolors": "~1.0.0", - "prettier": "~2.7.1", + "prettier": "~2.8.1", "prompts": "~2.4.1", "vscode-languageserver": "~8.0.2", "vscode-languageserver-textdocument": "~1.0.1", @@ -11514,12 +11659,6 @@ "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } - }, - "prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==", - "dev": true } } }, @@ -11541,49 +11680,49 @@ } }, "@cadl-lang/eslint-plugin": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.38.0.tgz", - "integrity": "sha512-qAW2hU5J49m3Ppj+jZnDlGde9f0t7pRwiVbY1MlgunWvf20fF74p3e66rVKfp9N+lTeuD+rpCYIFvaLbEqcang==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.39.0.tgz", + "integrity": "sha512-TbNbOuWiNABDzkPYQgZK+sa0740U6V9YRwsGn0pdUGHlFkbN/3rQkhyiiEPHfJkQXKrp2Y4gZLGRl0g7MkuDCA==", "dev": true, "requires": { "@typescript-eslint/utils": "~5.26.0" } }, "@cadl-lang/library-linter": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.38.0.tgz", - "integrity": "sha512-2fIJ+zer9KKJEjER4XvZ07mr+hN3CWPRKrycMknyVRAn2Uc+4iGKP7Tc7OUQ3y/WtQKPrvt0lBDszr+6jO2MKA==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.39.0.tgz", + "integrity": "sha512-omnr7kaF1iSXPlgMG0gQqne531gusjK+PBgAFuy6c4AIAlmDz/h5Xm1Jv95VEIUyAsbvlIhKl5bOZ5+DzzKoHw==", "dev": true, "requires": {} }, "@cadl-lang/lint": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.38.0.tgz", - "integrity": "sha512-6g4yoXeaNnTYxEWA0QywN3HkTCINPTHI56IsDKp6JhLOiROj1NvoufUzX438vdTqDqNyHg2t08fRmLMJP4GsCQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.39.0.tgz", + "integrity": "sha512-qaWnOYH68ppEDI4jWhPMk6gUIs7t/VYREAjvjniwjc5IYhHPFz5hzFUjmZOAp1az9bxJVwBVtGp1pSB8LFgXCQ==", "dev": true, "requires": {} }, "@cadl-lang/openapi": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.38.0.tgz", - "integrity": "sha512-lFmU5AsZtw7Ofcnq3lg18Ieg21iuS73NOb+549BxPZX2j70vEqqfRT3CCCFmpGCK2sAUy2x2qD+pVUBcQIXeHQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.39.0.tgz", + "integrity": "sha512-N/NlryVdaFKzzSdbLeko09M5s2aNEnZsMXHYCMCb9b0HLeJJ/cR/nCulTxCoNO1VMN5VWdSaohBtle4EHS/HSw==", "dev": true, "requires": {} }, "@cadl-lang/rest": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.38.0.tgz", - "integrity": "sha512-DvLLoUaG3//nf4HC4BhFFNK8cotYbwtL35cb6Nko8MYruLCuxQn0vZKtAMLnlvZWXc65qfbnTz1W/EI0NQh8+w==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.39.0.tgz", + "integrity": "sha512-KpEpC/kEoeEFT4DpuG6G4kK2kzuQ4sH85P99ched8CLAo2SzWT0WVYEjya1ony+hqKlvm2nrigattX7P1ES8TQ==", "dev": true, "requires": {} }, "@cadl-lang/versioning": { - "version": "0.38.0", - "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.38.0.tgz", - "integrity": "sha512-7ECvYQShLu80eyQzRgRH1Lu/P1lrjnHpnEcNZK8bVoHoy+QT+DkY/c22OoBRwcb5kux9/T1/CMF61WqfrKC8jQ==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.39.0.tgz", + "integrity": "sha512-mMmqHTo/Cwssb5Y1qC5Fb4rPkyt7JPK+bWT8KH/oprdG3MOJSemyeEIxQtkId3oBdHZiQHG7T9IN80Dks3GE/A==", "dev": true, "requires": { - "@cadl-lang/compiler": "~0.38.0" + "@cadl-lang/compiler": "~0.39.0" } }, "@colors/colors": { @@ -11604,15 +11743,15 @@ } }, "@eslint/eslintrc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.3.tgz", - "integrity": "sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz", + "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==", "dev": true, "requires": { "ajv": "^6.12.4", "debug": "^4.3.2", "espree": "^9.4.0", - "globals": "^13.15.0", + "globals": "^13.19.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -11630,9 +11769,9 @@ } }, "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -11653,9 +11792,9 @@ } }, "@humanwhocodes/config-array": { - "version": "0.11.7", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.7.tgz", - "integrity": "sha512-kBbPWzN8oVMLb0hOUYXhmxggL/1cJE6ydvjDIGi9EnAGUyA7cLVKQg+d/Dsm+KZwx2czGHrCmMVLiyg8s5JPKw==", + "version": "0.11.8", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz", + "integrity": "sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==", "dev": true, "requires": { "@humanwhocodes/object-schema": "^1.2.1", @@ -12016,9 +12155,9 @@ } }, "@opentelemetry/api": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.3.0.tgz", - "integrity": "sha512-YveTnGNsFFixTKJz09Oi4zYkiLT5af3WpZDu4aIUM7xX+2bHAkOJayFTVQd6zB8kkWPpbua4Ha6Ql00grdLlJQ==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.0.tgz", + "integrity": "sha512-IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g==", "dev": true }, "@rushstack/eslint-patch": { @@ -12052,13 +12191,13 @@ "dev": true }, "@types/babel__core": { - "version": "7.1.20", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.20.tgz", - "integrity": "sha512-PVb6Bg2QuscZ30FvOU7z4guG6c926D9YRvOxEaelzndpMsvP+YM74Q/dAFASpg2l6+XLalxSGxcq/lrgYWZtyQ==", + "version": "7.20.0", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.0.tgz", + "integrity": "sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==", "dev": true, "requires": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0", + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", "@types/babel__generator": "*", "@types/babel__template": "*", "@types/babel__traverse": "*" @@ -12102,9 +12241,9 @@ } }, "@types/graceful-fs": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz", - "integrity": "sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==", + "version": "4.1.6", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.6.tgz", + "integrity": "sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==", "dev": true, "requires": { "@types/node": "*" @@ -12153,9 +12292,9 @@ "dev": true }, "@types/node": { - "version": "18.11.14", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.14.tgz", - "integrity": "sha512-0KXV57tENYmmJMl+FekeW9V3O/rlcqGQQJ/hNh9r8pKIj304pskWuEd8fCyNT86g/TpO0gcOTiLzsHLEURFMIQ==", + "version": "18.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.18.tgz", + "integrity": "sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==", "dev": true }, "@types/node-fetch": { @@ -12175,9 +12314,9 @@ "dev": true }, "@types/prettier": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.1.tgz", - "integrity": "sha512-ri0UmynRRvZiiUJdiz38MmIblKK+oH30MztdBVR95dv/Ubw6neWSb8u1XpRb72L4qsZOhz+L+z9JD40SJmfWow==", + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.2.tgz", + "integrity": "sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==", "dev": true }, "@types/semver": { @@ -12202,9 +12341,9 @@ } }, "@types/yargs": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", - "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", + "version": "16.0.5", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.5.tgz", + "integrity": "sha512-AxO/ADJOBFJScHbWhq2xAhlWP24rY4aCEG/NFaMvbT3X2MgRsLjhjQwsn0Zi5zn0LG9jUhCCZMeX9Dkuw6k+vQ==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -12217,14 +12356,14 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz", - "integrity": "sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.49.0.tgz", + "integrity": "sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/type-utils": "5.46.1", - "@typescript-eslint/utils": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/type-utils": "5.49.0", + "@typescript-eslint/utils": "5.49.0", "debug": "^4.3.4", "ignore": "^5.2.0", "natural-compare-lite": "^1.4.0", @@ -12234,16 +12373,16 @@ }, "dependencies": { "@typescript-eslint/utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", - "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", + "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" @@ -12258,6 +12397,15 @@ "ms": "2.1.2" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12272,18 +12420,24 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "@typescript-eslint/parser": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.46.1.tgz", - "integrity": "sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.49.0.tgz", + "integrity": "sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "debug": "^4.3.4" }, "dependencies": { @@ -12305,38 +12459,38 @@ } }, "@typescript-eslint/scope-manager": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz", - "integrity": "sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.49.0.tgz", + "integrity": "sha512-clpROBOiMIzpbWNxCe1xDK14uPZh35u4QaZO1GddilEzoCLAEz4szb51rBpdgurs5k2YzPtJeTEN3qVbG+LRUQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/visitor-keys": "5.46.1" + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/visitor-keys": "5.49.0" } }, "@typescript-eslint/type-utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz", - "integrity": "sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.49.0.tgz", + "integrity": "sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==", "dev": true, "requires": { - "@typescript-eslint/typescript-estree": "5.46.1", - "@typescript-eslint/utils": "5.46.1", + "@typescript-eslint/typescript-estree": "5.49.0", + "@typescript-eslint/utils": "5.49.0", "debug": "^4.3.4", "tsutils": "^3.21.0" }, "dependencies": { "@typescript-eslint/utils": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.46.1.tgz", - "integrity": "sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.49.0.tgz", + "integrity": "sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.46.1", - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/typescript-estree": "5.46.1", + "@typescript-eslint/scope-manager": "5.49.0", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/typescript-estree": "5.49.0", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0", "semver": "^7.3.7" @@ -12351,6 +12505,15 @@ "ms": "2.1.2" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12365,23 +12528,29 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "@typescript-eslint/types": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.46.1.tgz", - "integrity": "sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.49.0.tgz", + "integrity": "sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz", - "integrity": "sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.49.0.tgz", + "integrity": "sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.46.1", - "@typescript-eslint/visitor-keys": "5.46.1", + "@typescript-eslint/types": "5.49.0", + "@typescript-eslint/visitor-keys": "5.49.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -12412,6 +12581,15 @@ "slash": "^3.0.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12426,6 +12604,12 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -12507,6 +12691,15 @@ "slash": "^3.0.0" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -12521,16 +12714,22 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "@typescript-eslint/visitor-keys": { - "version": "5.46.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz", - "integrity": "sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.49.0.tgz", + "integrity": "sha512-v9jBMjpNWyn8B6k/Mjt6VbUS4J1GvUlR4x3Y+ibnP1z7y7V4n0WRz+50DY6+Myj0UaXVSuUlHohO+eZ8IJEnkg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.46.1", + "@typescript-eslint/types": "5.49.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -12557,9 +12756,9 @@ } }, "acorn": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz", - "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz", + "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==", "dev": true }, "acorn-globals": { @@ -12735,9 +12934,9 @@ "dev": true }, "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "axios": { @@ -12953,15 +13152,15 @@ "dev": true }, "browserslist": { - "version": "4.21.4", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", - "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", + "version": "4.21.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", + "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001400", - "electron-to-chromium": "^1.4.251", - "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.9" + "caniuse-lite": "^1.0.30001449", + "electron-to-chromium": "^1.4.284", + "node-releases": "^2.0.8", + "update-browserslist-db": "^1.0.10" } }, "bs-logger": { @@ -13144,9 +13343,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30001439", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz", - "integrity": "sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==", + "version": "1.0.30001449", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001449.tgz", + "integrity": "sha512-CPB+UL9XMT/Av+pJxCKGhdx+yg1hzplvFJQlJ2n68PyQGMz9L/E2zCyLdOL8uasbouTUgnPl+y0tccI/se+BEw==", "dev": true }, "capital-case": { @@ -13230,9 +13429,9 @@ } }, "ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.1.tgz", + "integrity": "sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==", "dev": true }, "cjs-module-lexer": { @@ -13391,9 +13590,9 @@ } }, "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true }, "convert-source-map": { @@ -13464,9 +13663,9 @@ } }, "data-uri-to-buffer": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz", - "integrity": "sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", "dev": true }, "data-urls": { @@ -13508,17 +13707,19 @@ "dev": true }, "deep-equal": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.1.0.tgz", - "integrity": "sha512-2pxgvWu3Alv1PoWEyVg7HS8YhGlUFUV7N5oOvfL6d+7xAmLSemMwv/c8Zv/i9KFzxV5Kt5CAvQc70fLwVuf4UA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz", + "integrity": "sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-get-iterator": "^1.1.2", "get-intrinsic": "^1.1.3", "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.1", "is-date-object": "^1.0.5", "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", "isarray": "^2.0.5", "object-is": "^1.1.5", "object-keys": "^1.1.1", @@ -13527,7 +13728,7 @@ "side-channel": "^1.0.4", "which-boxed-primitive": "^1.0.2", "which-collection": "^1.0.1", - "which-typed-array": "^1.1.8" + "which-typed-array": "^1.1.9" } }, "deep-is": { @@ -13537,9 +13738,9 @@ "dev": true }, "deepmerge": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", - "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz", + "integrity": "sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og==", "dev": true }, "define-lazy-prop": { @@ -13719,19 +13920,20 @@ } }, "es-get-iterator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.2.tgz", - "integrity": "sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", "dev": true, "requires": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.0", - "has-symbols": "^1.0.1", - "is-arguments": "^1.1.0", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", "is-map": "^2.0.2", "is-set": "^2.0.2", - "is-string": "^1.0.5", - "isarray": "^2.0.5" + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" } }, "escalade": { @@ -13766,13 +13968,13 @@ } }, "eslint": { - "version": "8.29.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.29.0.tgz", - "integrity": "sha512-isQ4EEiyUjZFbEKvEGJKKGBwXtvXX+zJbkVKCgTuB9t/+jUBcy8avhkEwWJecI15BkRkOYmvIM5ynbhRjEkoeg==", + "version": "8.33.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.33.0.tgz", + "integrity": "sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA==", "dev": true, "requires": { - "@eslint/eslintrc": "^1.3.3", - "@humanwhocodes/config-array": "^0.11.6", + "@eslint/eslintrc": "^1.4.1", + "@humanwhocodes/config-array": "^0.11.8", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.10.0", @@ -13791,7 +13993,7 @@ "file-entry-cache": "^6.0.1", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.15.0", + "globals": "^13.19.0", "grapheme-splitter": "^1.0.4", "ignore": "^5.2.0", "import-fresh": "^3.0.0", @@ -13848,9 +14050,9 @@ } }, "globals": { - "version": "13.19.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz", - "integrity": "sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ==", + "version": "13.20.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz", + "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==", "dev": true, "requires": { "type-fest": "^0.20.2" @@ -13937,9 +14139,9 @@ } }, "eslint-config-prettier": { - "version": "8.5.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz", - "integrity": "sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz", + "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==", "dev": true, "requires": {} }, @@ -13984,6 +14186,15 @@ "strip-indent": "^3.0.0" }, "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -13992,6 +14203,12 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -14241,9 +14458,9 @@ "dev": true }, "fastq": { - "version": "1.14.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz", - "integrity": "sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", + "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", "dev": true, "requires": { "reusify": "^1.0.4" @@ -14465,9 +14682,9 @@ "dev": true }, "get-intrinsic": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz", - "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", "dev": true, "requires": { "function-bind": "^1.1.1", @@ -14790,9 +15007,9 @@ } }, "ignore": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.1.tgz", - "integrity": "sha512-d2qQLzTJ9WxQftPAuEQpSPmKqzxePjzVbpAVv62AQ64NTL+wR4JkrVqR/LqFsFEUsHDAiId52mJteHDFuDkElA==", + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", "dev": true }, "import-fresh": { @@ -14851,6 +15068,17 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "dev": true }, + "internal-slot": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz", + "integrity": "sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==", + "dev": true, + "requires": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "side-channel": "^1.0.4" + } + }, "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -14867,6 +15095,17 @@ "has-tostringtag": "^1.0.0" } }, + "is-array-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.1.tgz", + "integrity": "sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-typed-array": "^1.1.10" + } + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -14902,9 +15141,9 @@ } }, "is-builtin-module": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.0.tgz", - "integrity": "sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.2.1.tgz", + "integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==", "dev": true, "requires": { "builtin-modules": "^3.3.0" @@ -15028,6 +15267,15 @@ "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", "dev": true }, + "is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "requires": { + "call-bind": "^1.0.2" + } + }, "is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", @@ -15622,6 +15870,15 @@ "semver": "^7.3.2" }, "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -15630,6 +15887,12 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -15707,9 +15970,9 @@ } }, "js-sdsl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz", - "integrity": "sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.3.0.tgz", + "integrity": "sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ==", "dev": true }, "js-tokens": { @@ -15850,21 +16113,15 @@ "dev": true }, "jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz", + "integrity": "sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==", "dev": true, "requires": { "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", + "lodash": "^4.17.21", "ms": "^2.1.1", - "semver": "^5.6.0" + "semver": "^7.3.8" }, "dependencies": { "jwa": { @@ -15888,6 +16145,15 @@ "safe-buffer": "^5.0.1" } }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -15895,9 +16161,18 @@ "dev": true }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true } } @@ -15990,42 +16265,6 @@ "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", "dev": true }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", - "dev": true - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", - "dev": true - }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", - "dev": true - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", - "dev": true - }, "lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", @@ -16038,12 +16277,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true - }, "log-symbols": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", @@ -16085,12 +16318,12 @@ } }, "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "yallist": "^4.0.0" + "yallist": "^3.0.2" } }, "make-dir": { @@ -16497,9 +16730,9 @@ "dev": true }, "node-releases": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz", - "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==", + "version": "2.0.9", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.9.tgz", + "integrity": "sha512-2xfmOrRkGogbTK9R6Leda0DGiXeY3p2NJpy4+gNCffdUvV6mdEJnaDEic1i3Ec2djAo8jWYoJMR5PB0MSMpxUA==", "dev": true }, "node-watch": { @@ -16556,9 +16789,9 @@ "dev": true }, "object-inspect": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", - "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", "dev": true }, "object-is": { @@ -16825,9 +17058,9 @@ "dev": true }, "prettier": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz", - "integrity": "sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==", + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.3.tgz", + "integrity": "sha512-tJ/oJ4amDihPoufT5sM0Z1SKEuKay8LfVAMlbbhnnkvt6BUserZylqo2PN+p9KeljLr0OHa2rXHU1T8reeoTrw==", "dev": true }, "prettier-linter-helpers": { @@ -16897,9 +17130,9 @@ "dev": true }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, "qs": { @@ -17196,9 +17429,9 @@ "dev": true }, "resolve.exports": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz", - "integrity": "sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.1.tgz", + "integrity": "sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==", "dev": true }, "reusify": { @@ -17241,9 +17474,9 @@ } }, "safe-stable-stringify": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.1.tgz", - "integrity": "sha512-dVHE6bMtS/bnL2mwualjc6IxEv1F+OCUpA46pKUj6F8uDbUM0jCCulPqRNPSnWwGNKx5etqMjZYdXtrm5KJZGA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz", + "integrity": "sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA==", "dev": true }, "safer-buffer": { @@ -17509,6 +17742,15 @@ "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==", "dev": true }, + "stop-iteration-iterator": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", + "dev": true, + "requires": { + "internal-slot": "^1.0.4" + } + }, "stoppable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", @@ -17666,9 +17908,9 @@ "dev": true }, "throat": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", - "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz", + "integrity": "sha512-WKexMoJj3vEuK0yFEapj8y64V0A6xcuPuK9Gt1d0R+dzCSJc0lHqQytAbSB4cDAK0dWh4T0E2ETkoLE2WZ41OQ==", "dev": true }, "tmpl": { @@ -17741,6 +17983,15 @@ "yargs-parser": "20.x" }, "dependencies": { + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, "semver": { "version": "7.3.8", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", @@ -17749,13 +18000,19 @@ "requires": { "lru-cache": "^6.0.0" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz", + "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==", "dev": true }, "tsutils": { @@ -17837,9 +18094,9 @@ } }, "typescript": { - "version": "4.9.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.4.tgz", - "integrity": "sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, "underscore": { @@ -18282,9 +18539,9 @@ "dev": true }, "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, "yargs": { diff --git a/src/CADL.Extension/Emitter.Csharp/package.json b/src/CADL.Extension/Emitter.Csharp/package.json index b5323c5bd61..5382c00a6e1 100644 --- a/src/CADL.Extension/Emitter.Csharp/package.json +++ b/src/CADL.Extension/Emitter.Csharp/package.json @@ -48,16 +48,16 @@ }, "dependencies": { "@autorest/csharp": "3.0.0-beta.20221201.1", - "@azure-tools/cadl-autorest": "0.24.0", - "@azure-tools/cadl-azure-core": "0.24.0", - "@azure-tools/cadl-dpg": "0.24.0", - "@cadl-lang/compiler": "0.38.5", + "@azure-tools/cadl-autorest": "0.25.0", + "@azure-tools/cadl-azure-core": "0.25.0", + "@azure-tools/cadl-dpg": "0.25.0", + "@cadl-lang/compiler": "0.39.0", "@cadl-lang/eslint-config-cadl": "0.5.0", - "@cadl-lang/eslint-plugin": "0.38.0", - "@cadl-lang/library-linter": "0.38.0", - "@cadl-lang/openapi": "0.38.0", - "@cadl-lang/rest": "0.38.0", - "@cadl-lang/versioning": "0.38.0", + "@cadl-lang/eslint-plugin": "0.39.0", + "@cadl-lang/library-linter": "0.39.0", + "@cadl-lang/openapi": "0.39.0", + "@cadl-lang/rest": "0.39.0", + "@cadl-lang/versioning": "0.39.0", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "json-serialize-refs": "^0.1.0-0" diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/Generated/cadl.json index 4d8c0f5ffa3..c509df5308b 100644 --- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/Generated/cadl.json +++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/Generated/cadl.json @@ -25,7 +25,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -95,10 +95,41 @@ }, { "$id": "13", + "Name": "apiVersion", + "NameInRequest": "api-version", + "Description": "", + "Type": { + "$id": "14", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Location": "Query", + "IsRequired": true, + "IsApiVersion": true, + "IsContentType": false, + "IsEndpoint": false, + "IsResourceParameter": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Client", + "DefaultValue": { + "$id": "15", + "Type": { + "$id": "16", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Value": "2022-05-15-preview" + } + }, + { + "$id": "17", "Name": "name", "NameInRequest": "name", "Type": { - "$id": "14", + "$id": "18", "Name": "string", "Kind": "String", "IsNullable": false @@ -114,15 +145,15 @@ "Kind": "Method" }, { - "$id": "15", + "$id": "19", "Name": "contentType", "NameInRequest": "Content-Type", "Description": "This request has a JSON Merge Patch body.", "Type": { - "$id": "16", + "$id": "20", "Name": "Literal", "LiteralValueType": { - "$id": "17", + "$id": "21", "Name": "String", "Kind": "String", "IsNullable": false @@ -132,9 +163,9 @@ }, "Location": "Header", "DefaultValue": { - "$id": "18", + "$id": "22", "Type": { - "$ref": "16" + "$ref": "20" }, "Value": "application/merge-patch+json" }, @@ -147,41 +178,11 @@ "Explode": false, "Kind": "Constant" }, - { - "$id": "19", - "Name": "apiVersion", - "NameInRequest": "api-version", - "Description": "", - "Type": { - "$id": "20", - "Name": "String", - "Kind": "String", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": true, - "IsApiVersion": true, - "IsContentType": false, - "IsEndpoint": false, - "IsResourceParameter": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Client", - "DefaultValue": { - "$id": "21", - "Type": { - "$id": "22", - "Name": "String", - "Kind": "String", - "IsNullable": false - }, - "Value": "2022-05-15-preview" - } - }, { "$id": "23", - "Name": "Pet", - "NameInRequest": "Pet", + "Name": "resource", + "NameInRequest": "resource", + "Description": "The resource instance.", "Type": { "$ref": "2" }, diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl index 3c062d464c8..3e842b9fc1d 100644 --- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl +++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl @@ -31,6 +31,7 @@ scalar Endpoint extends string; @resource("Pet") model Pet { @key + @visibility("read") name: string; tag?: string; diff --git a/test/CadlRanchMockApis/package.json b/test/CadlRanchMockApis/package.json index f9fe95b7f1d..26fc3badd34 100644 --- a/test/CadlRanchMockApis/package.json +++ b/test/CadlRanchMockApis/package.json @@ -32,6 +32,6 @@ "dist/**" ], "dependencies": { - "@azure-tools/cadl-ranch-specs": "0.6.0" + "@azure-tools/cadl-ranch-specs": "0.6.6" } } \ No newline at end of file diff --git a/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl b/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl index 31ffd40fcf4..f003424a345 100644 --- a/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl +++ b/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl @@ -35,6 +35,7 @@ scalar Endpoint extends string; model Project { @key + @visibility("read") @segment("projects") projectName: string; @@ -91,6 +92,7 @@ model ProjectSettings is Record; @parentResource(Project) model Deployment { @key("deploymentName") + @visibility("read") @segment("deployments") name: string; } @@ -147,6 +149,7 @@ model DeploymentJob { ...Job; @key("jobId") + @visibility("read") @segment("jobs") id: string; } @@ -156,6 +159,7 @@ model SwapDeploymentsJob { ...Job; @key("jobId") + @visibility("read") @segment("swap/jobs") id: string; } diff --git a/test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs b/test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs index 779fa02775d..7cf7ab38aec 100644 --- a/test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs +++ b/test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs @@ -439,22 +439,24 @@ public virtual Response GetDeployment(string projectName, string deploymentName, /// Creates a new deployment or replaces an existing one. /// The String to use. /// The String to use. + /// The content to send as the body of the request. Details of the request body schema are in the Remarks section below. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. - /// or is null. + /// , or is null. /// or is an empty string, and was expected to be non-empty. /// Service returned a non-success status code. /// The response returned from the service. Details of the response body schema are in the Remarks section below. - /// - public virtual async Task DeployProjectAsync(string projectName, string deploymentName, RequestContext context = null) + /// + public virtual async Task DeployProjectAsync(string projectName, string deploymentName, RequestContent content, RequestContext context = null) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(deploymentName, nameof(deploymentName)); + Argument.AssertNotNull(content, nameof(content)); using var scope = ClientDiagnostics.CreateScope("AuthoringClient.DeployProject"); scope.Start(); try { - using HttpMessage message = CreateDeployProjectRequest(projectName, deploymentName, context); + using HttpMessage message = CreateDeployProjectRequest(projectName, deploymentName, content, context); return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); } catch (Exception e) @@ -467,22 +469,24 @@ public virtual async Task DeployProjectAsync(string projectName, strin /// Creates a new deployment or replaces an existing one. /// The String to use. /// The String to use. + /// The content to send as the body of the request. Details of the request body schema are in the Remarks section below. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. - /// or is null. + /// , or is null. /// or is an empty string, and was expected to be non-empty. /// Service returned a non-success status code. /// The response returned from the service. Details of the response body schema are in the Remarks section below. - /// - public virtual Response DeployProject(string projectName, string deploymentName, RequestContext context = null) + /// + public virtual Response DeployProject(string projectName, string deploymentName, RequestContent content, RequestContext context = null) { Argument.AssertNotNullOrEmpty(projectName, nameof(projectName)); Argument.AssertNotNullOrEmpty(deploymentName, nameof(deploymentName)); + Argument.AssertNotNull(content, nameof(content)); using var scope = ClientDiagnostics.CreateScope("AuthoringClient.DeployProject"); scope.Start(); try { - using HttpMessage message = CreateDeployProjectRequest(projectName, deploymentName, context); + using HttpMessage message = CreateDeployProjectRequest(projectName, deploymentName, content, context); return _pipeline.ProcessMessage(message, context); } catch (Exception e) @@ -837,32 +841,26 @@ public virtual Response GetSwapDeploymentsStatus(string projectName, string depl } /// Lists the existing projects. - /// The Int32 to use. - /// The Int32 to use. - /// The Int32 to use. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - /// - public virtual AsyncPageable GetProjectsAsync(int? maxCount = null, int? skip = null, int? maxpagesize = null, RequestContext context = null) + /// + public virtual AsyncPageable GetProjectsAsync(RequestContext context = null) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(maxCount, skip, maxpagesize, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, maxCount, skip, maxpagesize, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "AuthoringClient.GetProjects", "value", "nextLink", context); } /// Lists the existing projects. - /// The Int32 to use. - /// The Int32 to use. - /// The Int32 to use. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - /// - public virtual Pageable GetProjects(int? maxCount = null, int? skip = null, int? maxpagesize = null, RequestContext context = null) + /// + public virtual Pageable GetProjects(RequestContext context = null) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(maxCount, skip, maxpagesize, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, maxCount, skip, maxpagesize, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "AuthoringClient.GetProjects", "value", "nextLink", context); } @@ -1006,7 +1004,7 @@ internal HttpMessage CreateDeleteRequest(string projectName, RequestContext cont return message; } - internal HttpMessage CreateGetProjectsRequest(int? maxCount, int? skip, int? maxpagesize, RequestContext context) + internal HttpMessage CreateGetProjectsRequest(RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -1015,18 +1013,6 @@ internal HttpMessage CreateGetProjectsRequest(int? maxCount, int? skip, int? max uri.Reset(_endpoint); uri.AppendRaw("/language", false); uri.AppendPath("/authoring/analyze-text/projects", false); - if (maxCount != null) - { - uri.AppendQuery("top", maxCount.Value, true); - } - if (skip != null) - { - uri.AppendQuery("skip", skip.Value, true); - } - if (maxpagesize != null) - { - uri.AppendQuery("maxpagesize", maxpagesize.Value, true); - } uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -1105,7 +1091,7 @@ internal HttpMessage CreateGetDeploymentRequest(string projectName, string deplo return message; } - internal HttpMessage CreateDeployProjectRequest(string projectName, string deploymentName, RequestContext context) + internal HttpMessage CreateDeployProjectRequest(string projectName, string deploymentName, RequestContent content, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200201); var request = message.Request; @@ -1120,6 +1106,8 @@ internal HttpMessage CreateDeployProjectRequest(string projectName, string deplo uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); + request.Headers.Add("Content-Type", "application/json"); + request.Content = content; return message; } @@ -1271,7 +1259,7 @@ internal HttpMessage CreateGetTrainingConfigVersionsRequest(int? maxCount, int? return message; } - internal HttpMessage CreateGetProjectsNextPageRequest(string nextLink, int? maxCount, int? skip, int? maxpagesize, RequestContext context) + internal HttpMessage CreateGetProjectsNextPageRequest(string nextLink, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; diff --git a/test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml b/test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml index 3e861978876..c6ce6c555cb 100644 --- a/test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml +++ b/test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml @@ -9,7 +9,6 @@ var endpoint = new Uri(""); var client = new AuthoringClient(endpoint); var data = new { - projectName = "", projectKind = "CustomSingleLabelClassification", storageInputContainerName = "", language = "", @@ -33,7 +32,6 @@ var endpoint = new Uri(""); var client = new AuthoringClient(endpoint); var data = new { - projectName = "", projectKind = "CustomSingleLabelClassification", storageInputContainerName = "", settings = new { @@ -109,7 +107,6 @@ var endpoint = new Uri(""); var client = new AuthoringClient(endpoint); var data = new { - projectName = "", projectKind = "CustomSingleLabelClassification", storageInputContainerName = "", language = "", @@ -133,7 +130,6 @@ var endpoint = new Uri(""); var client = new AuthoringClient(endpoint); var data = new { - projectName = "", projectKind = "CustomSingleLabelClassification", storageInputContainerName = "", settings = new { @@ -541,21 +537,31 @@ Schema for Deployment: - + -This sample shows how to call DeployProjectAsync with required parameters and parse the result. +This sample shows how to call DeployProjectAsync with required parameters and request content and parse the result. "); var client = new AuthoringClient(endpoint); -Response response = await client.DeployProjectAsync("", ""); +var data = new {}; + +Response response = await client.DeployProjectAsync("", "", RequestContent.Create(data)); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; Console.WriteLine(result.GetProperty("name").ToString()); ]]> -Below is the JSON schema for the response payload. +Below is the JSON schema for the request and response payloads. + +Request Body: + +Schema for Deployment: +{ + name: string, # Required. +} + Response Body: @@ -567,21 +573,31 @@ Schema for Deployment: - + -This sample shows how to call DeployProject with required parameters and parse the result. +This sample shows how to call DeployProject with required parameters and request content and parse the result. "); var client = new AuthoringClient(endpoint); -Response response = client.DeployProject("", ""); +var data = new {}; + +Response response = client.DeployProject("", "", RequestContent.Create(data)); JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; Console.WriteLine(result.GetProperty("name").ToString()); ]]> -Below is the JSON schema for the response payload. +Below is the JSON schema for the request and response payloads. + +Request Body: + +Schema for Deployment: +{ + name: string, # Required. +} + Response Body: @@ -937,7 +953,7 @@ Schema for SwapDeploymentsJob: - + This sample shows how to call GetProjectsAsync and parse the result. "); var client = new AuthoringClient(endpoint); await foreach (var data in client.GetProjectsAsync()) -{ - JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; - Console.WriteLine(result.GetProperty("projectName").ToString()); - Console.WriteLine(result.GetProperty("projectKind").ToString()); - Console.WriteLine(result.GetProperty("storageInputContainerName").ToString()); - Console.WriteLine(result.GetProperty("language").ToString()); - Console.WriteLine(result.GetProperty("createdDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString()); -} -]]> -This sample shows how to call GetProjectsAsync with all parameters, and how to parse the result. -"); -var client = new AuthoringClient(endpoint); - -await foreach (var data in client.GetProjectsAsync(1234, 1234, 1234)) { JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; Console.WriteLine(result.GetProperty("projectName").ToString()); @@ -1002,7 +1000,7 @@ Schema for Array: - + This sample shows how to call GetProjects and parse the result. "); var client = new AuthoringClient(endpoint); foreach (var data in client.GetProjects()) -{ - JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; - Console.WriteLine(result.GetProperty("projectName").ToString()); - Console.WriteLine(result.GetProperty("projectKind").ToString()); - Console.WriteLine(result.GetProperty("storageInputContainerName").ToString()); - Console.WriteLine(result.GetProperty("language").ToString()); - Console.WriteLine(result.GetProperty("createdDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString()); -} -]]> -This sample shows how to call GetProjects with all parameters, and how to parse the result. -"); -var client = new AuthoringClient(endpoint); - -foreach (var data in client.GetProjects(1234, 1234, 1234)) { JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; Console.WriteLine(result.GetProperty("projectName").ToString()); diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs b/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs index 3e9563f39bd..643a38fabe4 100644 --- a/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs +++ b/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs @@ -21,20 +21,17 @@ public partial class DeploymentJob /// /// /// - /// - /// , , or is null. - internal DeploymentJob(string jobId, JobStatus status, IEnumerable warnings, ResponseError errors, string id) + /// , or is null. + internal DeploymentJob(string jobId, JobStatus status, IEnumerable warnings, ResponseError errors) { Argument.AssertNotNull(jobId, nameof(jobId)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(errors, nameof(errors)); - Argument.AssertNotNull(id, nameof(id)); JobId = jobId; Status = status; Warnings = warnings.ToList(); Errors = errors; - Id = id; } /// Initializes a new instance of DeploymentJob. diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs b/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs index 7d2b73d2390..f1a622ccbfc 100644 --- a/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs +++ b/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs @@ -21,20 +21,17 @@ public partial class SwapDeploymentsJob /// /// /// - /// - /// , , or is null. - internal SwapDeploymentsJob(string jobId, JobStatus status, IEnumerable warnings, ResponseError errors, string id) + /// , or is null. + internal SwapDeploymentsJob(string jobId, JobStatus status, IEnumerable warnings, ResponseError errors) { Argument.AssertNotNull(jobId, nameof(jobId)); Argument.AssertNotNull(warnings, nameof(warnings)); Argument.AssertNotNull(errors, nameof(errors)); - Argument.AssertNotNull(id, nameof(id)); JobId = jobId; Status = status; Warnings = warnings.ToList(); Errors = errors; - Id = id; } /// Initializes a new instance of SwapDeploymentsJob. diff --git a/test/TestProjects/Authoring-Cadl/Generated/cadl.json b/test/TestProjects/Authoring-Cadl/Generated/cadl.json index 253b9791769..4eed053f1b1 100644 --- a/test/TestProjects/Authoring-Cadl/Generated/cadl.json +++ b/test/TestProjects/Authoring-Cadl/Generated/cadl.json @@ -103,7 +103,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -352,7 +352,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false } ] @@ -668,7 +668,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false } ] @@ -802,7 +802,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false } ] @@ -1006,10 +1006,41 @@ }, { "$id": "127", + "Name": "apiVersion", + "NameInRequest": "api-version", + "Description": "", + "Type": { + "$id": "128", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Location": "Query", + "IsRequired": true, + "IsApiVersion": true, + "IsContentType": false, + "IsEndpoint": false, + "IsResourceParameter": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Client", + "DefaultValue": { + "$id": "129", + "Type": { + "$id": "130", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Value": "2022-05-15-preview" + } + }, + { + "$id": "131", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "128", + "$id": "132", "Name": "string", "Kind": "String", "IsNullable": false @@ -1025,15 +1056,15 @@ "Kind": "Method" }, { - "$id": "129", + "$id": "133", "Name": "contentType", "NameInRequest": "Content-Type", "Description": "This request has a JSON Merge Patch body.", "Type": { - "$id": "130", + "$id": "134", "Name": "Literal", "LiteralValueType": { - "$id": "131", + "$id": "135", "Name": "String", "Kind": "String", "IsNullable": false @@ -1043,9 +1074,9 @@ }, "Location": "Header", "DefaultValue": { - "$id": "132", + "$id": "136", "Type": { - "$ref": "130" + "$ref": "134" }, "Value": "application/merge-patch+json" }, @@ -1058,41 +1089,11 @@ "Explode": false, "Kind": "Constant" }, - { - "$id": "133", - "Name": "apiVersion", - "NameInRequest": "api-version", - "Description": "", - "Type": { - "$id": "134", - "Name": "String", - "Kind": "String", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": true, - "IsApiVersion": true, - "IsContentType": false, - "IsEndpoint": false, - "IsResourceParameter": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Client", - "DefaultValue": { - "$id": "135", - "Type": { - "$id": "136", - "Name": "String", - "Kind": "String", - "IsNullable": false - }, - "Value": "2022-05-15-preview" - } - }, { "$id": "137", - "Name": "Project", - "NameInRequest": "Project", + "Name": "resource", + "NameInRequest": "resource", + "Description": "The resource instance.", "Type": { "$ref": "14" }, @@ -1205,6 +1206,9 @@ { "$ref": "125" }, + { + "$ref": "127" + }, { "$id": "148", "Name": "projectName", @@ -1225,9 +1229,6 @@ "Explode": false, "Kind": "Method" }, - { - "$ref": "133" - }, { "$id": "150", "Name": "accept", @@ -1286,6 +1287,9 @@ { "$ref": "125" }, + { + "$ref": "127" + }, { "$id": "155", "Name": "projectName", @@ -1306,9 +1310,6 @@ "Explode": false, "Kind": "Method" }, - { - "$ref": "133" - }, { "$id": "157", "Name": "accept", @@ -1381,74 +1382,14 @@ "$ref": "125" }, { - "$id": "164", - "Name": "top", - "NameInRequest": "top", - "Type": { - "$id": "165", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$id": "166", - "Name": "skip", - "NameInRequest": "skip", - "Type": { - "$id": "167", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$id": "168", - "Name": "maxpagesize", - "NameInRequest": "maxpagesize", - "Type": { - "$id": "169", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" + "$ref": "127" }, { - "$ref": "133" - }, - { - "$id": "170", + "$id": "164", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "171", + "$id": "165", "Name": "String", "Kind": "String", "IsNullable": false @@ -1463,9 +1404,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "172", + "$id": "166", "Type": { - "$ref": "171" + "$ref": "165" }, "Value": "application/json" } @@ -1473,7 +1414,7 @@ ], "Responses": [ { - "$id": "173", + "$id": "167", "StatusCodes": [ 200 ], @@ -1491,14 +1432,14 @@ "Path": "/authoring/analyze-text/projects", "BufferResponse": true, "Paging": { - "$id": "174", + "$id": "168", "NextLinkName": "nextLink", "ItemName": "value" }, "GenerateConvenienceMethod": false }, { - "$id": "175", + "$id": "169", "Name": "export", "ResourceName": "Projects", "Description": "Triggers a job to export a project's data.", @@ -1507,11 +1448,14 @@ "$ref": "125" }, { - "$id": "176", + "$ref": "127" + }, + { + "$id": "170", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "177", + "$id": "171", "Name": "string", "Kind": "String", "IsNullable": false @@ -1527,11 +1471,11 @@ "Kind": "Method" }, { - "$id": "178", + "$id": "172", "Name": "projectFileVersion", "NameInRequest": "projectFileVersion", "Type": { - "$id": "179", + "$id": "173", "Name": "string", "Kind": "String", "IsNullable": false @@ -1547,14 +1491,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "180", + "$id": "174", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "181", + "$id": "175", "Name": "String", "Kind": "String", "IsNullable": false @@ -1569,9 +1510,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "182", + "$id": "176", "Type": { - "$ref": "181" + "$ref": "175" }, "Value": "application/json" } @@ -1579,19 +1520,19 @@ ], "Responses": [ { - "$id": "183", + "$id": "177", "StatusCodes": [ 202 ], "BodyMediaType": "Json", "Headers": [ { - "$id": "184", + "$id": "178", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "185", + "$id": "179", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -1609,7 +1550,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "186", + "$id": "180", "Name": "importx", "ResourceName": "Projects", "Description": "Triggers a job to export a project's data.", @@ -1618,11 +1559,14 @@ "$ref": "125" }, { - "$id": "187", + "$ref": "127" + }, + { + "$id": "181", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "188", + "$id": "182", "Name": "string", "Kind": "String", "IsNullable": false @@ -1638,14 +1582,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "189", + "$id": "183", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "190", + "$id": "184", "Name": "String", "Kind": "String", "IsNullable": false @@ -1660,9 +1601,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "191", + "$id": "185", "Type": { - "$ref": "190" + "$ref": "184" }, "Value": "application/json" } @@ -1670,19 +1611,19 @@ ], "Responses": [ { - "$id": "192", + "$id": "186", "StatusCodes": [ 202 ], "BodyMediaType": "Json", "Headers": [ { - "$id": "193", + "$id": "187", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "194", + "$id": "188", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -1700,7 +1641,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "195", + "$id": "189", "Name": "train", "ResourceName": "Projects", "Description": "Triggers a training job for a project.", @@ -1709,11 +1650,14 @@ "$ref": "125" }, { - "$id": "196", + "$ref": "127" + }, + { + "$id": "190", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "197", + "$id": "191", "Name": "string", "Kind": "String", "IsNullable": false @@ -1729,10 +1673,7 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "198", + "$id": "192", "Name": "body", "NameInRequest": "body", "Type": { @@ -1749,11 +1690,11 @@ "Kind": "Method" }, { - "$id": "199", + "$id": "193", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "200", + "$id": "194", "Name": "String", "Kind": "String", "IsNullable": false @@ -1768,19 +1709,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "201", + "$id": "195", "Type": { - "$ref": "200" + "$ref": "194" }, "Value": "application/json" } }, { - "$id": "202", + "$id": "196", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "203", + "$id": "197", "Name": "String", "Kind": "String", "IsNullable": false @@ -1795,9 +1736,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "204", + "$id": "198", "Type": { - "$ref": "203" + "$ref": "197" }, "Value": "application/json" } @@ -1805,19 +1746,19 @@ ], "Responses": [ { - "$id": "205", + "$id": "199", "StatusCodes": [ 202 ], "BodyMediaType": "Json", "Headers": [ { - "$id": "206", + "$id": "200", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "207", + "$id": "201", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -1838,7 +1779,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "208", + "$id": "202", "Name": "getDeployment", "ResourceName": "Deployment", "Description": "Gets the details of a deployment.", @@ -1847,11 +1788,14 @@ "$ref": "125" }, { - "$id": "209", + "$ref": "127" + }, + { + "$id": "203", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "210", + "$id": "204", "Name": "string", "Kind": "String", "IsNullable": false @@ -1867,11 +1811,11 @@ "Kind": "Method" }, { - "$id": "211", + "$id": "205", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "212", + "$id": "206", "Name": "string", "Kind": "String", "IsNullable": false @@ -1887,14 +1831,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "213", + "$id": "207", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "214", + "$id": "208", "Name": "String", "Kind": "String", "IsNullable": false @@ -1909,9 +1850,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "215", + "$id": "209", "Type": { - "$ref": "214" + "$ref": "208" }, "Value": "application/json" } @@ -1919,7 +1860,7 @@ ], "Responses": [ { - "$id": "216", + "$id": "210", "StatusCodes": [ 200 ], @@ -1939,7 +1880,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "217", + "$id": "211", "Name": "deployProject", "ResourceName": "Deployment", "Description": "Creates a new deployment or replaces an existing one.", @@ -1948,11 +1889,14 @@ "$ref": "125" }, { - "$id": "218", + "$ref": "127" + }, + { + "$id": "212", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "219", + "$id": "213", "Name": "string", "Kind": "String", "IsNullable": false @@ -1968,11 +1912,11 @@ "Kind": "Method" }, { - "$id": "220", + "$id": "214", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "221", + "$id": "215", "Name": "string", "Kind": "String", "IsNullable": false @@ -1988,14 +1932,56 @@ "Kind": "Method" }, { - "$ref": "133" + "$id": "216", + "Name": "resource", + "NameInRequest": "resource", + "Description": "The resource instance.", + "Type": { + "$ref": "46" + }, + "Location": "Body", + "IsRequired": true, + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": false, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Method" + }, + { + "$id": "217", + "Name": "contentType", + "NameInRequest": "Content-Type", + "Type": { + "$id": "218", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Location": "Header", + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": true, + "IsRequired": true, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Constant", + "DefaultValue": { + "$id": "219", + "Type": { + "$ref": "218" + }, + "Value": "application/json" + } }, { - "$id": "222", + "$id": "220", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "223", + "$id": "221", "Name": "String", "Kind": "String", "IsNullable": false @@ -2010,9 +1996,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "224", + "$id": "222", "Type": { - "$ref": "223" + "$ref": "221" }, "Value": "application/json" } @@ -2020,7 +2006,7 @@ ], "Responses": [ { - "$id": "225", + "$id": "223", "StatusCodes": [ 200 ], @@ -2030,12 +2016,12 @@ "BodyMediaType": "Json", "Headers": [ { - "$id": "226", + "$id": "224", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "227", + "$id": "225", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -2045,7 +2031,7 @@ "IsErrorResponse": false }, { - "$id": "228", + "$id": "226", "StatusCodes": [ 201 ], @@ -2055,12 +2041,12 @@ "BodyMediaType": "Json", "Headers": [ { - "$id": "229", + "$id": "227", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "230", + "$id": "228", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -2074,11 +2060,14 @@ "RequestBodyMediaType": "Json", "Uri": "{Endpoint}/language", "Path": "/authoring/analyze-text/projects/{projectName}/deployments/{deploymentName}", + "RequestMediaTypes": [ + "application/json" + ], "BufferResponse": true, "GenerateConvenienceMethod": false }, { - "$id": "231", + "$id": "229", "Name": "deleteDeployment", "ResourceName": "Deployment", "Description": "Deletes a project deployment.", @@ -2087,11 +2076,14 @@ "$ref": "125" }, { - "$id": "232", + "$ref": "127" + }, + { + "$id": "230", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "233", + "$id": "231", "Name": "string", "Kind": "String", "IsNullable": false @@ -2107,11 +2099,11 @@ "Kind": "Method" }, { - "$id": "234", + "$id": "232", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "235", + "$id": "233", "Name": "string", "Kind": "String", "IsNullable": false @@ -2127,14 +2119,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "236", + "$id": "234", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "237", + "$id": "235", "Name": "String", "Kind": "String", "IsNullable": false @@ -2149,9 +2138,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "238", + "$id": "236", "Type": { - "$ref": "237" + "$ref": "235" }, "Value": "application/json" } @@ -2159,7 +2148,7 @@ ], "Responses": [ { - "$id": "239", + "$id": "237", "StatusCodes": [ 202 ], @@ -2169,12 +2158,12 @@ "BodyMediaType": "Json", "Headers": [ { - "$id": "240", + "$id": "238", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "241", + "$id": "239", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -2192,7 +2181,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "242", + "$id": "240", "Name": "list", "ResourceName": "Deployment", "Description": "Lists the existing deployments.", @@ -2201,11 +2190,14 @@ "$ref": "125" }, { - "$id": "243", + "$ref": "127" + }, + { + "$id": "241", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "244", + "$id": "242", "Name": "string", "Kind": "String", "IsNullable": false @@ -2221,14 +2213,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "245", + "$id": "243", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "246", + "$id": "244", "Name": "String", "Kind": "String", "IsNullable": false @@ -2243,9 +2232,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "247", + "$id": "245", "Type": { - "$ref": "246" + "$ref": "244" }, "Value": "application/json" } @@ -2253,7 +2242,7 @@ ], "Responses": [ { - "$id": "248", + "$id": "246", "StatusCodes": [ 200 ], @@ -2271,14 +2260,14 @@ "Path": "/authoring/analyze-text/projects/{projectName}/deployments", "BufferResponse": true, "Paging": { - "$id": "249", + "$id": "247", "NextLinkName": "nextLink", "ItemName": "value" }, "GenerateConvenienceMethod": false }, { - "$id": "250", + "$id": "248", "Name": "swapDeployments", "ResourceName": "Deployments", "Description": "Swaps two existing deployments with each other.", @@ -2287,11 +2276,14 @@ "$ref": "125" }, { - "$id": "251", + "$ref": "127" + }, + { + "$id": "249", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "252", + "$id": "250", "Name": "string", "Kind": "String", "IsNullable": false @@ -2307,10 +2299,7 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "253", + "$id": "251", "Name": "body", "NameInRequest": "body", "Description": "The body schema of the operation.", @@ -2328,11 +2317,11 @@ "Kind": "Method" }, { - "$id": "254", + "$id": "252", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "255", + "$id": "253", "Name": "String", "Kind": "String", "IsNullable": false @@ -2347,19 +2336,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "256", + "$id": "254", "Type": { - "$ref": "255" + "$ref": "253" }, "Value": "application/json" } }, { - "$id": "257", + "$id": "255", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "258", + "$id": "256", "Name": "String", "Kind": "String", "IsNullable": false @@ -2374,9 +2363,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "259", + "$id": "257", "Type": { - "$ref": "258" + "$ref": "256" }, "Value": "application/json" } @@ -2384,19 +2373,19 @@ ], "Responses": [ { - "$id": "260", + "$id": "258", "StatusCodes": [ 202 ], "BodyMediaType": "Json", "Headers": [ { - "$id": "261", + "$id": "259", "Name": "Operation-Location", "NameInResponse": "operationLocation", "Description": "The location for monitoring the operation state.", "Type": { - "$id": "262", + "$id": "260", "Name": "ResourceLocation", "Kind": "String", "IsNullable": false @@ -2417,7 +2406,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "263", + "$id": "261", "Name": "getDeploymentStatus", "ResourceName": "DeploymentJob", "Description": "Gets the status of an existing deployment job.", @@ -2426,11 +2415,14 @@ "$ref": "125" }, { - "$id": "264", + "$ref": "127" + }, + { + "$id": "262", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "265", + "$id": "263", "Name": "string", "Kind": "String", "IsNullable": false @@ -2446,11 +2438,11 @@ "Kind": "Method" }, { - "$id": "266", + "$id": "264", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "267", + "$id": "265", "Name": "string", "Kind": "String", "IsNullable": false @@ -2466,11 +2458,11 @@ "Kind": "Method" }, { - "$id": "268", + "$id": "266", "Name": "jobId", "NameInRequest": "jobId", "Type": { - "$id": "269", + "$id": "267", "Name": "string", "Kind": "String", "IsNullable": false @@ -2486,14 +2478,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "270", + "$id": "268", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "271", + "$id": "269", "Name": "String", "Kind": "String", "IsNullable": false @@ -2508,9 +2497,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "272", + "$id": "270", "Type": { - "$ref": "271" + "$ref": "269" }, "Value": "application/json" } @@ -2518,7 +2507,7 @@ ], "Responses": [ { - "$id": "273", + "$id": "271", "StatusCodes": [ 200 ], @@ -2538,7 +2527,7 @@ "GenerateConvenienceMethod": true }, { - "$id": "274", + "$id": "272", "Name": "getSwapDeploymentsStatus", "ResourceName": "SwapDeploymentsJob", "Description": "Gets the status of an existing swap deployment job.", @@ -2547,11 +2536,14 @@ "$ref": "125" }, { - "$id": "275", + "$ref": "127" + }, + { + "$id": "273", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "276", + "$id": "274", "Name": "string", "Kind": "String", "IsNullable": false @@ -2567,11 +2559,11 @@ "Kind": "Method" }, { - "$id": "277", + "$id": "275", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "278", + "$id": "276", "Name": "string", "Kind": "String", "IsNullable": false @@ -2587,11 +2579,11 @@ "Kind": "Method" }, { - "$id": "279", + "$id": "277", "Name": "jobId", "NameInRequest": "jobId", "Type": { - "$id": "280", + "$id": "278", "Name": "string", "Kind": "String", "IsNullable": false @@ -2607,14 +2599,11 @@ "Kind": "Method" }, { - "$ref": "133" - }, - { - "$id": "281", + "$id": "279", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "282", + "$id": "280", "Name": "String", "Kind": "String", "IsNullable": false @@ -2629,9 +2618,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "283", + "$id": "281", "Type": { - "$ref": "282" + "$ref": "280" }, "Value": "application/json" } @@ -2639,7 +2628,7 @@ ], "Responses": [ { - "$id": "284", + "$id": "282", "StatusCodes": [ 200 ], @@ -2659,7 +2648,7 @@ "GenerateConvenienceMethod": true }, { - "$id": "285", + "$id": "283", "Name": "getSupportedLanguages", "ResourceName": "Global", "Parameters": [ @@ -2667,11 +2656,11 @@ "$ref": "125" }, { - "$id": "286", + "$id": "284", "Name": "top", "NameInRequest": "top", "Type": { - "$id": "287", + "$id": "285", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2687,11 +2676,11 @@ "Kind": "Method" }, { - "$id": "288", + "$id": "286", "Name": "skip", "NameInRequest": "skip", "Type": { - "$id": "289", + "$id": "287", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2707,11 +2696,11 @@ "Kind": "Method" }, { - "$id": "290", + "$id": "288", "Name": "maxpagesize", "NameInRequest": "maxpagesize", "Type": { - "$id": "291", + "$id": "289", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2727,14 +2716,14 @@ "Kind": "Method" }, { - "$ref": "133" + "$ref": "127" }, { - "$id": "292", + "$id": "290", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "293", + "$id": "291", "Name": "String", "Kind": "String", "IsNullable": false @@ -2749,9 +2738,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "294", + "$id": "292", "Type": { - "$ref": "293" + "$ref": "291" }, "Value": "application/json" } @@ -2759,7 +2748,7 @@ ], "Responses": [ { - "$id": "295", + "$id": "293", "StatusCodes": [ 200 ], @@ -2777,14 +2766,14 @@ "Path": "/authoring/analyze-text/projects/global/languages", "BufferResponse": true, "Paging": { - "$id": "296", + "$id": "294", "NextLinkName": "nextLink", "ItemName": "value" }, "GenerateConvenienceMethod": false }, { - "$id": "297", + "$id": "295", "Name": "listTrainingConfigVersions", "ResourceName": "Global", "Parameters": [ @@ -2792,11 +2781,11 @@ "$ref": "125" }, { - "$id": "298", + "$id": "296", "Name": "top", "NameInRequest": "top", "Type": { - "$id": "299", + "$id": "297", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2812,11 +2801,11 @@ "Kind": "Method" }, { - "$id": "300", + "$id": "298", "Name": "skip", "NameInRequest": "skip", "Type": { - "$id": "301", + "$id": "299", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2832,11 +2821,11 @@ "Kind": "Method" }, { - "$id": "302", + "$id": "300", "Name": "maxpagesize", "NameInRequest": "maxpagesize", "Type": { - "$id": "303", + "$id": "301", "Name": "int32", "Kind": "Int32", "IsNullable": false @@ -2852,14 +2841,14 @@ "Kind": "Method" }, { - "$ref": "133" + "$ref": "127" }, { - "$id": "304", + "$id": "302", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "305", + "$id": "303", "Name": "String", "Kind": "String", "IsNullable": false @@ -2874,9 +2863,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "306", + "$id": "304", "Type": { - "$ref": "305" + "$ref": "303" }, "Value": "application/json" } @@ -2884,7 +2873,7 @@ ], "Responses": [ { - "$id": "307", + "$id": "305", "StatusCodes": [ 200 ], @@ -2902,7 +2891,7 @@ "Path": "/authoring/analyze-text/projects/global/training-config-versions", "BufferResponse": true, "Paging": { - "$id": "308", + "$id": "306", "NextLinkName": "nextLink", "ItemName": "value" }, @@ -2910,7 +2899,7 @@ } ], "Protocol": { - "$id": "309" + "$id": "307" }, "Creatable": true } diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs b/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs index c25a5dde22e..c71024df72f 100644 --- a/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs +++ b/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs @@ -57,27 +57,27 @@ public LroBasicCadlClient(Uri endpoint, LroBasicCadlClientOptions options) } /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. - /// The Project to use. + /// The resource instance. /// The cancellation token to use. - /// is null. - public virtual async Task CreateProjectAsync(WaitUntil waitUntil, Project project, CancellationToken cancellationToken = default) + /// is null. + public virtual async Task CreateProjectAsync(WaitUntil waitUntil, Project resource, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(project, nameof(project)); + Argument.AssertNotNull(resource, nameof(resource)); RequestContext context = FromCancellationToken(cancellationToken); - return await CreateProjectAsync(waitUntil, project.ToRequestContent(), context).ConfigureAwait(false); + return await CreateProjectAsync(waitUntil, resource.ToRequestContent(), context).ConfigureAwait(false); } /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. - /// The Project to use. + /// The resource instance. /// The cancellation token to use. - /// is null. - public virtual Operation CreateProject(WaitUntil waitUntil, Project project, CancellationToken cancellationToken = default) + /// is null. + public virtual Operation CreateProject(WaitUntil waitUntil, Project resource, CancellationToken cancellationToken = default) { - Argument.AssertNotNull(project, nameof(project)); + Argument.AssertNotNull(resource, nameof(resource)); RequestContext context = FromCancellationToken(cancellationToken); - return CreateProject(waitUntil, project.ToRequestContent(), context); + return CreateProject(waitUntil, resource.ToRequestContent(), context); } /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. @@ -132,33 +132,33 @@ public virtual Operation CreateProject(WaitUntil waitUntil, RequestContent conte /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. /// The String to use. - /// The Project to use. + /// The resource instance. /// The cancellation token to use. - /// or is null. + /// or is null. /// is an empty string, and was expected to be non-empty. - public virtual async Task> UpdateProjectAsync(WaitUntil waitUntil, string id, Project project, CancellationToken cancellationToken = default) + public virtual async Task> UpdateProjectAsync(WaitUntil waitUntil, string id, Project resource, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(id, nameof(id)); - Argument.AssertNotNull(project, nameof(project)); + Argument.AssertNotNull(resource, nameof(resource)); RequestContext context = FromCancellationToken(cancellationToken); - Operation response = await UpdateProjectAsync(waitUntil, id, project.ToRequestContent(), context).ConfigureAwait(false); + Operation response = await UpdateProjectAsync(waitUntil, id, resource.ToRequestContent(), context).ConfigureAwait(false); return ProtocolOperationHelpers.Convert(response, Project.FromResponse, ClientDiagnostics, "LroBasicCadlClient.UpdateProject"); } /// if the method should wait to return until the long-running operation has completed on the service; if it should return after starting the operation. For more information on long-running operations, please see Azure.Core Long-Running Operation samples. /// The String to use. - /// The Project to use. + /// The resource instance. /// The cancellation token to use. - /// or is null. + /// or is null. /// is an empty string, and was expected to be non-empty. - public virtual Operation UpdateProject(WaitUntil waitUntil, string id, Project project, CancellationToken cancellationToken = default) + public virtual Operation UpdateProject(WaitUntil waitUntil, string id, Project resource, CancellationToken cancellationToken = default) { Argument.AssertNotNullOrEmpty(id, nameof(id)); - Argument.AssertNotNull(project, nameof(project)); + Argument.AssertNotNull(resource, nameof(resource)); RequestContext context = FromCancellationToken(cancellationToken); - Operation response = UpdateProject(waitUntil, id, project.ToRequestContent(), context); + Operation response = UpdateProject(waitUntil, id, resource.ToRequestContent(), context); return ProtocolOperationHelpers.Convert(response, Project.FromResponse, ClientDiagnostics, "LroBasicCadlClient.UpdateProject"); } diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json b/test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json index 20d1a76a396..059ba4cb97b 100644 --- a/test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json +++ b/test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json @@ -125,8 +125,9 @@ }, { "$id": "17", - "Name": "Project", - "NameInRequest": "Project", + "Name": "resource", + "NameInRequest": "resource", + "Description": "The resource instance.", "Type": { "$ref": "2" }, @@ -263,6 +264,9 @@ { "$ref": "11" }, + { + "$ref": "13" + }, { "$id": "32", "Name": "id", @@ -283,13 +287,11 @@ "Explode": false, "Kind": "Method" }, - { - "$ref": "13" - }, { "$id": "34", - "Name": "Project", - "NameInRequest": "Project", + "Name": "resource", + "NameInRequest": "resource", + "Description": "The resource instance.", "Type": { "$ref": "2" }, diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml b/test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml index f5d18c12667..26211424ab4 100644 --- a/test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml +++ b/test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml @@ -99,7 +99,6 @@ var endpoint = new Uri(""); var client = new MixApiVersionClient(endpoint); var data = new { - name = "", age = 1234, }; @@ -115,7 +114,6 @@ var endpoint = new Uri(""); var client = new MixApiVersionClient(endpoint); var data = new { - name = "", tag = "", age = 1234, }; @@ -161,7 +159,6 @@ var endpoint = new Uri(""); var client = new MixApiVersionClient(endpoint); var data = new { - name = "", age = 1234, }; @@ -177,7 +174,6 @@ var endpoint = new Uri(""); var client = new MixApiVersionClient(endpoint); var data = new { - name = "", tag = "", age = 1234, }; diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json b/test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json index 6e9be06bc4d..2b95168636d 100644 --- a/test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json +++ b/test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json @@ -27,7 +27,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -97,7 +97,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -194,32 +194,11 @@ }, { "$id": "25", - "Name": "name", - "NameInRequest": "name", - "Description": "pet name", - "Type": { - "$id": "26", - "Name": "string", - "Kind": "String", - "IsNullable": false - }, - "Location": "Path", - "IsRequired": true, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$id": "27", "Name": "apiVersion", "NameInRequest": "api-version", "Description": "", "Type": { - "$id": "28", + "$id": "26", "Name": "String", "Kind": "String", "IsNullable": false @@ -234,9 +213,9 @@ "Explode": false, "Kind": "Client", "DefaultValue": { - "$id": "29", + "$id": "27", "Type": { - "$id": "30", + "$id": "28", "Name": "String", "Kind": "String", "IsNullable": false @@ -244,6 +223,27 @@ "Value": "2022-11-30-preview" } }, + { + "$id": "29", + "Name": "name", + "NameInRequest": "name", + "Description": "pet name", + "Type": { + "$id": "30", + "Name": "string", + "Kind": "String", + "IsNullable": false + }, + "Location": "Path", + "IsRequired": true, + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": false, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Method" + }, { "$id": "31", "Name": "accept", @@ -348,7 +348,7 @@ } }, { - "$ref": "27" + "$ref": "25" } ], "Responses": [ @@ -532,7 +532,7 @@ "$ref": "23" }, { - "$ref": "27" + "$ref": "25" }, { "$id": "57", diff --git a/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl b/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl index 18be2647a8e..a19e36cea8e 100644 --- a/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl +++ b/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl @@ -27,6 +27,7 @@ namespace MixApiVersion; @resource("Pet") model Pet { @key + @visibility("read") @doc("pet name") name: string; tag?: string; @@ -39,6 +40,7 @@ model Pet { @resource("Toy") model Toy { @key + @visibility("read") id: int64; petId: int64; name: string; diff --git a/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs index f89485dfd84..10cb7aa717c 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs @@ -6,7 +6,6 @@ #nullable disable using System.Text.Json; -using Azure; using Azure.Core; namespace ModelsInCadl.Models @@ -19,22 +18,6 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteEndObject(); } - internal static BaseModel DeserializeBaseModel(JsonElement element) - { - foreach (var property in element.EnumerateObject()) - { - } - return new BaseModel(); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static BaseModel FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content); - return DeserializeBaseModel(document.RootElement); - } - /// Convert into a Utf8JsonRequestContent. internal virtual RequestContent ToRequestContent() { diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs index 59406b59a2b..2992228d09d 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs @@ -48,7 +48,7 @@ internal static DerivedModel DeserializeDerivedModel(JsonElement element) /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal new static DerivedModel FromResponse(Response response) + internal static DerivedModel FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); return DeserializeDerivedModel(document.RootElement); diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs index 342c9007c5f..966be145ca3 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs @@ -153,7 +153,7 @@ internal static RoundTripModel DeserializeRoundTripModel(JsonElement element) /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal new static RoundTripModel FromResponse(Response response) + internal static RoundTripModel FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); return DeserializeRoundTripModel(document.RootElement); diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs index 6c13ec0e091..2f8edb3e5d0 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs @@ -102,7 +102,7 @@ internal static RoundTripPrimitiveModel DeserializeRoundTripPrimitiveModel(JsonE /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal new static RoundTripPrimitiveModel FromResponse(Response response) + internal static RoundTripPrimitiveModel FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); return DeserializeRoundTripPrimitiveModel(document.RootElement); diff --git a/test/TestProjects/Models-Cadl/Generated/cadl.json b/test/TestProjects/Models-Cadl/Generated/cadl.json index 460480bf37e..d761e1b3d9d 100644 --- a/test/TestProjects/Models-Cadl/Generated/cadl.json +++ b/test/TestProjects/Models-Cadl/Generated/cadl.json @@ -140,7 +140,7 @@ "Namespace": "ModelsInCadl", "Description": "Base model", "IsNullable": false, - "Usage": "RoundTrip", + "Usage": "Input", "Properties": [] }, "IsRequired": true, diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml b/test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml index b2fa163c78f..a1e0fef1937 100644 --- a/test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml +++ b/test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml @@ -145,7 +145,7 @@ Schema for Deployment: - + This sample shows how to call GetProjectsAsync and parse the result. "); var client = new RenameGetListClient(endpoint); await foreach (var data in client.GetProjectsAsync()) -{ - JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; - Console.WriteLine(result.GetProperty("projectName").ToString()); - Console.WriteLine(result.GetProperty("projectKind").ToString()); - Console.WriteLine(result.GetProperty("storageInputContainerName").ToString()); - Console.WriteLine(result.GetProperty("language").ToString()); - Console.WriteLine(result.GetProperty("createdDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString()); -} -]]> -This sample shows how to call GetProjectsAsync with all parameters, and how to parse the result. -"); -var client = new RenameGetListClient(endpoint); - -await foreach (var data in client.GetProjectsAsync(1234, 1234, 1234)) { JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; Console.WriteLine(result.GetProperty("projectName").ToString()); @@ -210,7 +192,7 @@ Schema for Array: - + This sample shows how to call GetProjects and parse the result. "); var client = new RenameGetListClient(endpoint); foreach (var data in client.GetProjects()) -{ - JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; - Console.WriteLine(result.GetProperty("projectName").ToString()); - Console.WriteLine(result.GetProperty("projectKind").ToString()); - Console.WriteLine(result.GetProperty("storageInputContainerName").ToString()); - Console.WriteLine(result.GetProperty("language").ToString()); - Console.WriteLine(result.GetProperty("createdDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastModifiedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastTrainedDateTime").ToString()); - Console.WriteLine(result.GetProperty("lastDeployedDateTime").ToString()); -} -]]> -This sample shows how to call GetProjects with all parameters, and how to parse the result. -"); -var client = new RenameGetListClient(endpoint); - -foreach (var data in client.GetProjects(1234, 1234, 1234)) { JsonElement result = JsonDocument.Parse(data.ToStream()).RootElement; Console.WriteLine(result.GetProperty("projectName").ToString()); diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs b/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs index a1c3a2770d6..58ca2c6060f 100644 --- a/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs +++ b/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs @@ -163,32 +163,26 @@ public virtual Response GetDeployment(string projectName, string deploymentName, } /// Lists the existing projects. - /// The Int32 to use. - /// The Int32 to use. - /// The Int32 to use. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - /// - public virtual AsyncPageable GetProjectsAsync(int? maxCount = null, int? skip = null, int? maxpagesize = null, RequestContext context = null) + /// + public virtual AsyncPageable GetProjectsAsync(RequestContext context = null) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(maxCount, skip, maxpagesize, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, maxCount, skip, maxpagesize, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); return PageableHelpers.CreateAsyncPageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "RenameGetListClient.GetProjects", "value", "nextLink", context); } /// Lists the existing projects. - /// The Int32 to use. - /// The Int32 to use. - /// The Int32 to use. /// The request context, which can override default behaviors of the client pipeline on a per-call basis. /// Service returned a non-success status code. /// The from the service containing a list of objects. Details of the body schema for each item in the collection are in the Remarks section below. - /// - public virtual Pageable GetProjects(int? maxCount = null, int? skip = null, int? maxpagesize = null, RequestContext context = null) + /// + public virtual Pageable GetProjects(RequestContext context = null) { - HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(maxCount, skip, maxpagesize, context); - HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, maxCount, skip, maxpagesize, context); + HttpMessage FirstPageRequest(int? pageSizeHint) => CreateGetProjectsRequest(context); + HttpMessage NextPageRequest(int? pageSizeHint, string nextLink) => CreateGetProjectsNextPageRequest(nextLink, context); return PageableHelpers.CreatePageable(FirstPageRequest, NextPageRequest, e => BinaryData.FromString(e.GetRawText()), ClientDiagnostics, _pipeline, "RenameGetListClient.GetProjects", "value", "nextLink", context); } @@ -242,7 +236,7 @@ internal HttpMessage CreateGetProjectRequest(string projectName, RequestContext return message; } - internal HttpMessage CreateGetProjectsRequest(int? maxCount, int? skip, int? maxpagesize, RequestContext context) + internal HttpMessage CreateGetProjectsRequest(RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; @@ -251,18 +245,6 @@ internal HttpMessage CreateGetProjectsRequest(int? maxCount, int? skip, int? max uri.Reset(_endpoint); uri.AppendRaw("/language", false); uri.AppendPath("/authoring/analyze-text/projects", false); - if (maxCount != null) - { - uri.AppendQuery("top", maxCount.Value, true); - } - if (skip != null) - { - uri.AppendQuery("skip", skip.Value, true); - } - if (maxpagesize != null) - { - uri.AppendQuery("maxpagesize", maxpagesize.Value, true); - } uri.AppendQuery("api-version", _apiVersion, true); request.Uri = uri; request.Headers.Add("Accept", "application/json"); @@ -304,7 +286,7 @@ internal HttpMessage CreateGetDeploymentsRequest(string projectName, RequestCont return message; } - internal HttpMessage CreateGetProjectsNextPageRequest(string nextLink, int? maxCount, int? skip, int? maxpagesize, RequestContext context) + internal HttpMessage CreateGetProjectsNextPageRequest(string nextLink, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); var request = message.Request; diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/cadl.json b/test/TestProjects/RenameGetList-Cadl/Generated/cadl.json index 9325343c1ac..f39347c82b1 100644 --- a/test/TestProjects/RenameGetList-Cadl/Generated/cadl.json +++ b/test/TestProjects/RenameGetList-Cadl/Generated/cadl.json @@ -56,7 +56,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -280,7 +280,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false } ] @@ -320,31 +320,11 @@ }, { "$id": "42", - "Name": "projectName", - "NameInRequest": "projectName", - "Type": { - "$id": "43", - "Name": "string", - "Kind": "String", - "IsNullable": false - }, - "Location": "Path", - "IsRequired": true, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$id": "44", "Name": "apiVersion", "NameInRequest": "api-version", "Description": "", "Type": { - "$id": "45", + "$id": "43", "Name": "String", "Kind": "String", "IsNullable": false @@ -359,9 +339,9 @@ "Explode": false, "Kind": "Client", "DefaultValue": { - "$id": "46", + "$id": "44", "Type": { - "$id": "47", + "$id": "45", "Name": "String", "Kind": "String", "IsNullable": false @@ -369,6 +349,26 @@ "Value": "2022-05-15-preview" } }, + { + "$id": "46", + "Name": "projectName", + "NameInRequest": "projectName", + "Type": { + "$id": "47", + "Name": "string", + "Kind": "String", + "IsNullable": false + }, + "Location": "Path", + "IsRequired": true, + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": false, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Method" + }, { "$id": "48", "Name": "accept", @@ -428,74 +428,14 @@ "$ref": "40" }, { - "$id": "53", - "Name": "top", - "NameInRequest": "top", - "Type": { - "$id": "54", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" + "$ref": "42" }, { - "$id": "55", - "Name": "skip", - "NameInRequest": "skip", - "Type": { - "$id": "56", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$id": "57", - "Name": "maxpagesize", - "NameInRequest": "maxpagesize", - "Type": { - "$id": "58", - "Name": "int32", - "Kind": "Int32", - "IsNullable": false - }, - "Location": "Query", - "IsRequired": false, - "IsApiVersion": false, - "IsResourceParameter": false, - "IsContentType": false, - "IsEndpoint": false, - "SkipUrlEncoding": false, - "Explode": false, - "Kind": "Method" - }, - { - "$ref": "44" - }, - { - "$id": "59", + "$id": "53", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "60", + "$id": "54", "Name": "String", "Kind": "String", "IsNullable": false @@ -510,9 +450,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "61", + "$id": "55", "Type": { - "$ref": "60" + "$ref": "54" }, "Value": "application/json" } @@ -520,7 +460,7 @@ ], "Responses": [ { - "$id": "62", + "$id": "56", "StatusCodes": [ 200 ], @@ -538,14 +478,14 @@ "Path": "/authoring/analyze-text/projects", "BufferResponse": true, "Paging": { - "$id": "63", + "$id": "57", "NextLinkName": "nextLink", "ItemName": "value" }, "GenerateConvenienceMethod": false }, { - "$id": "64", + "$id": "58", "Name": "get", "ResourceName": "Deployment", "Description": "Gets the details of a deployment.", @@ -554,11 +494,14 @@ "$ref": "40" }, { - "$id": "65", + "$ref": "42" + }, + { + "$id": "59", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "66", + "$id": "60", "Name": "string", "Kind": "String", "IsNullable": false @@ -574,11 +517,11 @@ "Kind": "Method" }, { - "$id": "67", + "$id": "61", "Name": "deploymentName", "NameInRequest": "deploymentName", "Type": { - "$id": "68", + "$id": "62", "Name": "string", "Kind": "String", "IsNullable": false @@ -594,14 +537,11 @@ "Kind": "Method" }, { - "$ref": "44" - }, - { - "$id": "69", + "$id": "63", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "70", + "$id": "64", "Name": "String", "Kind": "String", "IsNullable": false @@ -616,9 +556,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "71", + "$id": "65", "Type": { - "$ref": "70" + "$ref": "64" }, "Value": "application/json" } @@ -626,7 +566,7 @@ ], "Responses": [ { - "$id": "72", + "$id": "66", "StatusCodes": [ 200 ], @@ -646,7 +586,7 @@ "GenerateConvenienceMethod": false }, { - "$id": "73", + "$id": "67", "Name": "list", "ResourceName": "Deployment", "Description": "Lists the existing deployments.", @@ -655,11 +595,14 @@ "$ref": "40" }, { - "$id": "74", + "$ref": "42" + }, + { + "$id": "68", "Name": "projectName", "NameInRequest": "projectName", "Type": { - "$id": "75", + "$id": "69", "Name": "string", "Kind": "String", "IsNullable": false @@ -675,14 +618,11 @@ "Kind": "Method" }, { - "$ref": "44" - }, - { - "$id": "76", + "$id": "70", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "77", + "$id": "71", "Name": "String", "Kind": "String", "IsNullable": false @@ -697,9 +637,9 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "78", + "$id": "72", "Type": { - "$ref": "77" + "$ref": "71" }, "Value": "application/json" } @@ -707,7 +647,7 @@ ], "Responses": [ { - "$id": "79", + "$id": "73", "StatusCodes": [ 200 ], @@ -725,7 +665,7 @@ "Path": "/authoring/analyze-text/projects/{projectName}/deployments", "BufferResponse": true, "Paging": { - "$id": "80", + "$id": "74", "NextLinkName": "nextLink", "ItemName": "value" }, @@ -733,7 +673,7 @@ } ], "Protocol": { - "$id": "81" + "$id": "75" }, "Creatable": true } diff --git a/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl b/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl index d5c5a0825b3..3cfa1ca48fd 100644 --- a/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl +++ b/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl @@ -35,6 +35,7 @@ scalar Endpoint extends string; model Project { @key + @visibility("read") @segment("projects") projectName: string; @@ -91,6 +92,7 @@ model ProjectSettings is Record; @parentResource(Project) model Deployment { @key("deploymentName") + @visibility("read") @segment("deployments") name: string; } From 72dbe4e76f0d4a6d39eb43e325da4573e257f9a8 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Tue, 31 Jan 2023 16:20:46 +0800 Subject: [PATCH 2/9] update package-lock.json --- package-lock.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package-lock.json b/package-lock.json index 51556ddec33..2061bf50385 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10555,6 +10555,7 @@ } }, "src/CADL.Extension/Emitter.Csharp": { + "name": "@azure-tools/cadl-csharp", "version": "0.1.11", "dev": true, "license": "MIT", @@ -10588,6 +10589,7 @@ } }, "test/CadlRanchMockApis": { + "name": "@azure-tools/cadl-ranch-mockapis", "version": "0.0.1", "dev": true, "license": "MIT", From 66f39866da801b7037f7fd9301fc3a3eb209f00d Mon Sep 17 00:00:00 2001 From: ArcturusZhang Date: Tue, 31 Jan 2023 16:31:48 +0800 Subject: [PATCH 3/9] remove the usage != None check for model generation --- .../LowLevel/Output/DpgOutputLibraryBuilder.cs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/AutoRest.CSharp/LowLevel/Output/DpgOutputLibraryBuilder.cs b/src/AutoRest.CSharp/LowLevel/Output/DpgOutputLibraryBuilder.cs index 378b92784b5..b355dce30ef 100644 --- a/src/AutoRest.CSharp/LowLevel/Output/DpgOutputLibraryBuilder.cs +++ b/src/AutoRest.CSharp/LowLevel/Output/DpgOutputLibraryBuilder.cs @@ -69,10 +69,7 @@ private void CreateEnums(IDictionary dictionary, TypeFa { foreach (var inputEnum in _rootNamespace.Enums) { - if (inputEnum.Usage != InputModelTypeUsage.None) - { - dictionary.Add(inputEnum, new EnumType(inputEnum, TypeProvider.GetDefaultModelNamespace(null,_defaultNamespace), "public", typeFactory, _sourceInputModel)); - } + dictionary.Add(inputEnum, new EnumType(inputEnum, TypeProvider.GetDefaultModelNamespace(null, _defaultNamespace), "public", typeFactory, _sourceInputModel)); } } @@ -96,13 +93,10 @@ private void CreateModels(IDictionary models, foreach (var model in _rootNamespace.Models) { - if (model.Usage != InputModelTypeUsage.None) - { - derivedTypesLookup.TryGetValue(model, out var children); - InputModelType[] derivedTypesArray = children?.ToArray() ?? Array.Empty(); - ModelTypeProvider? defaultDerivedType = GetDefaultDerivedType(models, typeFactory, model, derivedTypesArray, defaultDerivedTypes); - models.Add(model, new ModelTypeProvider(model, TypeProvider.GetDefaultModelNamespace(null, _defaultNamespace), _sourceInputModel, typeFactory, derivedTypesArray, defaultDerivedType)); - } + derivedTypesLookup.TryGetValue(model, out var children); + InputModelType[] derivedTypesArray = children?.ToArray() ?? Array.Empty(); + ModelTypeProvider? defaultDerivedType = GetDefaultDerivedType(models, typeFactory, model, derivedTypesArray, defaultDerivedTypes); + models.Add(model, new ModelTypeProvider(model, TypeProvider.GetDefaultModelNamespace(null, _defaultNamespace), _sourceInputModel, typeFactory, derivedTypesArray, defaultDerivedType)); } } From a7aa81f71728b343beb726e95ab066e9dceebd25 Mon Sep 17 00:00:00 2001 From: ArcturusZhang Date: Tue, 31 Jan 2023 17:47:57 +0800 Subject: [PATCH 4/9] add a test case --- .../Generated/Docs/ModelsInCadlClient.xml | 112 ++++++ .../Models/NoUseBase.Serialization.cs | 54 +++ .../Models-Cadl/Generated/Models/NoUseBase.cs | 29 ++ .../Models/RoundTripOnNoUse.Serialization.cs | 73 ++++ .../Generated/Models/RoundTripOnNoUse.cs | 44 +++ .../Generated/ModelsInCadlClient.cs | 91 +++++ .../Models-Cadl/Generated/cadl.json | 352 +++++++++++++----- .../TestProjects/Models-Cadl/Models-Cadl.cadl | 17 + 8 files changed, 676 insertions(+), 96 deletions(-) create mode 100644 test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs create mode 100644 test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs create mode 100644 test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs create mode 100644 test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs diff --git a/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml b/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml index 45c27abf969..58d60cff2fe 100644 --- a/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml +++ b/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml @@ -1249,6 +1249,118 @@ Schema for ErrorModel: } + + + + +This sample shows how to call RoundTripToOutputWithNoUseBaseAsync with required request content and parse the result. +", +}; + +Response response = await client.RoundTripToOutputWithNoUseBaseAsync(RequestContent.Create(data)); + +JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; +Console.WriteLine(result.GetProperty("baseModelProp").ToString()); +]]> + + +Below is the JSON schema for the request and response payloads. + +Request Body: + +Schema for RoundTripOnNoUse: +{ + requiredCollection: [ + { + requiredModelRecord: Dictionary<string, RecordItem>, # Required. + } + ], # Required. + baseModelProp: string, # Required. +} + + +Response Body: + +Schema for RoundTripOnNoUse: +{ + requiredCollection: [ + { + requiredModelRecord: Dictionary<string, RecordItem>, # Required. + } + ], # Required. + baseModelProp: string, # Required. +} + + + + + + +This sample shows how to call RoundTripToOutputWithNoUseBase with required request content and parse the result. +", +}; + +Response response = client.RoundTripToOutputWithNoUseBase(RequestContent.Create(data)); + +JsonElement result = JsonDocument.Parse(response.ContentStream).RootElement; +Console.WriteLine(result.GetProperty("baseModelProp").ToString()); +]]> + + +Below is the JSON schema for the request and response payloads. + +Request Body: + +Schema for RoundTripOnNoUse: +{ + requiredCollection: [ + { + requiredModelRecord: Dictionary<string, RecordItem>, # Required. + } + ], # Required. + baseModelProp: string, # Required. +} + + +Response Body: + +Schema for RoundTripOnNoUse: +{ + requiredCollection: [ + { + requiredModelRecord: Dictionary<string, RecordItem>, # Required. + } + ], # Required. + baseModelProp: string, # Required. +} + + diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs new file mode 100644 index 00000000000..43d73320c6d --- /dev/null +++ b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs @@ -0,0 +1,54 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.Text.Json; +using Azure; +using Azure.Core; + +namespace ModelsInCadl.Models +{ + public partial class NoUseBase : IUtf8JsonSerializable + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) + { + writer.WriteStartObject(); + writer.WritePropertyName("baseModelProp"); + writer.WriteStringValue(BaseModelProp); + writer.WriteEndObject(); + } + + internal static NoUseBase DeserializeNoUseBase(JsonElement element) + { + string baseModelProp = default; + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("baseModelProp")) + { + baseModelProp = property.Value.GetString(); + continue; + } + } + return new NoUseBase(baseModelProp); + } + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal static NoUseBase FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content); + return DeserializeNoUseBase(document.RootElement); + } + + /// Convert into a Utf8JsonRequestContent. + internal virtual RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this); + return content; + } + } +} diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs new file mode 100644 index 00000000000..fe81e016bb2 --- /dev/null +++ b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs @@ -0,0 +1,29 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using Azure.Core; + +namespace ModelsInCadl.Models +{ + /// Base model. + public partial class NoUseBase + { + /// Initializes a new instance of NoUseBase. + /// + /// is null. + public NoUseBase(string baseModelProp) + { + Argument.AssertNotNull(baseModelProp, nameof(baseModelProp)); + + BaseModelProp = baseModelProp; + } + + /// Gets or sets the base model prop. + public string BaseModelProp { get; set; } + } +} diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs new file mode 100644 index 00000000000..702d57d9016 --- /dev/null +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs @@ -0,0 +1,73 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System.Collections.Generic; +using System.Text.Json; +using Azure; +using Azure.Core; + +namespace ModelsInCadl.Models +{ + public partial class RoundTripOnNoUse : IUtf8JsonSerializable + { + void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) + { + writer.WriteStartObject(); + writer.WritePropertyName("requiredCollection"); + writer.WriteStartArray(); + foreach (var item in RequiredCollection) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); + writer.WritePropertyName("baseModelProp"); + writer.WriteStringValue(BaseModelProp); + writer.WriteEndObject(); + } + + internal static RoundTripOnNoUse DeserializeRoundTripOnNoUse(JsonElement element) + { + IList requiredCollection = default; + string baseModelProp = default; + foreach (var property in element.EnumerateObject()) + { + if (property.NameEquals("requiredCollection")) + { + List array = new List(); + foreach (var item in property.Value.EnumerateArray()) + { + array.Add(CollectionItem.DeserializeCollectionItem(item)); + } + requiredCollection = array; + continue; + } + if (property.NameEquals("baseModelProp")) + { + baseModelProp = property.Value.GetString(); + continue; + } + } + return new RoundTripOnNoUse(baseModelProp, requiredCollection); + } + + /// Deserializes the model from a raw response. + /// The response to deserialize the model from. + internal new static RoundTripOnNoUse FromResponse(Response response) + { + using var document = JsonDocument.Parse(response.Content); + return DeserializeRoundTripOnNoUse(document.RootElement); + } + + /// Convert into a Utf8JsonRequestContent. + internal override RequestContent ToRequestContent() + { + var content = new Utf8JsonRequestContent(); + content.JsonWriter.WriteObjectValue(this); + return content; + } + } +} diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs new file mode 100644 index 00000000000..e03787b041c --- /dev/null +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs @@ -0,0 +1,44 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.Collections.Generic; +using System.Linq; +using Azure.Core; + +namespace ModelsInCadl.Models +{ + /// Derived model. + public partial class RoundTripOnNoUse : NoUseBase + { + /// Initializes a new instance of RoundTripOnNoUse. + /// + /// + /// or is null. + public RoundTripOnNoUse(string baseModelProp, IEnumerable requiredCollection) : base(baseModelProp) + { + Argument.AssertNotNull(baseModelProp, nameof(baseModelProp)); + Argument.AssertNotNull(requiredCollection, nameof(requiredCollection)); + + RequiredCollection = requiredCollection.ToList(); + } + + /// Initializes a new instance of RoundTripOnNoUse. + /// + /// + /// is null. + internal RoundTripOnNoUse(string baseModelProp, IList requiredCollection) : base(baseModelProp) + { + Argument.AssertNotNull(baseModelProp, nameof(baseModelProp)); + + RequiredCollection = requiredCollection.ToList(); + } + + /// Gets the required collection. + public IList RequiredCollection { get; } + } +} diff --git a/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs b/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs index 606963c21f8..f1c4f615b5f 100644 --- a/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs +++ b/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs @@ -660,6 +660,82 @@ public virtual Response SelfReference(RequestContext context = null) } } + /// Returns RoundTripOnNoUse. + /// The RoundTripOnNoUse to use. + /// The cancellation token to use. + /// is null. + public virtual async Task> RoundTripToOutputWithNoUseBaseAsync(RoundTripOnNoUse input, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(input, nameof(input)); + + RequestContext context = FromCancellationToken(cancellationToken); + Response response = await RoundTripToOutputWithNoUseBaseAsync(input.ToRequestContent(), context).ConfigureAwait(false); + return Response.FromValue(RoundTripOnNoUse.FromResponse(response), response); + } + + /// Returns RoundTripOnNoUse. + /// The RoundTripOnNoUse to use. + /// The cancellation token to use. + /// is null. + public virtual Response RoundTripToOutputWithNoUseBase(RoundTripOnNoUse input, CancellationToken cancellationToken = default) + { + Argument.AssertNotNull(input, nameof(input)); + + RequestContext context = FromCancellationToken(cancellationToken); + Response response = RoundTripToOutputWithNoUseBase(input.ToRequestContent(), context); + return Response.FromValue(RoundTripOnNoUse.FromResponse(response), response); + } + + /// Returns RoundTripOnNoUse. + /// The content to send as the body of the request. Details of the request body schema are in the Remarks section below. + /// The request context, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. Details of the response body schema are in the Remarks section below. + /// + public virtual async Task RoundTripToOutputWithNoUseBaseAsync(RequestContent content, RequestContext context = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using var scope = ClientDiagnostics.CreateScope("ModelsInCadlClient.RoundTripToOutputWithNoUseBase"); + scope.Start(); + try + { + using HttpMessage message = CreateRoundTripToOutputWithNoUseBaseRequest(content, context); + return await _pipeline.ProcessMessageAsync(message, context).ConfigureAwait(false); + } + catch (Exception e) + { + scope.Failed(e); + throw; + } + } + + /// Returns RoundTripOnNoUse. + /// The content to send as the body of the request. Details of the request body schema are in the Remarks section below. + /// The request context, which can override default behaviors of the client pipeline on a per-call basis. + /// is null. + /// Service returned a non-success status code. + /// The response returned from the service. Details of the response body schema are in the Remarks section below. + /// + public virtual Response RoundTripToOutputWithNoUseBase(RequestContent content, RequestContext context = null) + { + Argument.AssertNotNull(content, nameof(content)); + + using var scope = ClientDiagnostics.CreateScope("ModelsInCadlClient.RoundTripToOutputWithNoUseBase"); + scope.Start(); + try + { + using HttpMessage message = CreateRoundTripToOutputWithNoUseBaseRequest(content, context); + return _pipeline.ProcessMessage(message, context); + } + catch (Exception e) + { + scope.Failed(e); + throw; + } + } + internal HttpMessage CreateInputToRoundTripRequest(RequestContent content, RequestContext context) { var message = _pipeline.CreateMessage(context, ResponseClassifier200); @@ -778,6 +854,21 @@ internal HttpMessage CreateSelfReferenceRequest(RequestContext context) return message; } + internal HttpMessage CreateRoundTripToOutputWithNoUseBaseRequest(RequestContent content, RequestContext context) + { + var message = _pipeline.CreateMessage(context, ResponseClassifier200); + var request = message.Request; + request.Method = RequestMethod.Get; + var uri = new RawRequestUriBuilder(); + uri.AppendPath("/", false); + uri.AppendQuery("api-version", _apiVersion, true); + request.Uri = uri; + request.Headers.Add("Accept", "application/json"); + request.Headers.Add("Content-Type", "application/json"); + request.Content = content; + return message; + } + private static RequestContext DefaultRequestContext = new RequestContext(); internal static RequestContext FromCancellationToken(CancellationToken cancellationToken = default) { diff --git a/test/TestProjects/Models-Cadl/Generated/cadl.json b/test/TestProjects/Models-Cadl/Generated/cadl.json index d761e1b3d9d..885070ad7b3 100644 --- a/test/TestProjects/Models-Cadl/Generated/cadl.json +++ b/test/TestProjects/Models-Cadl/Generated/cadl.json @@ -1553,22 +1553,77 @@ "IsDiscriminator": false } ] + }, + { + "$id": "195", + "Name": "NoUseBase", + "Namespace": "ModelsInCadl", + "Description": "Base model", + "IsNullable": false, + "Usage": "RoundTrip", + "Properties": [ + { + "$id": "196", + "Name": "baseModelProp", + "SerializedName": "baseModelProp", + "Description": "", + "Type": { + "$id": "197", + "Name": "string", + "Kind": "String", + "IsNullable": false + }, + "IsRequired": true, + "IsReadOnly": false, + "IsDiscriminator": false + } + ] + }, + { + "$id": "198", + "Name": "RoundTripOnNoUse", + "Namespace": "ModelsInCadl", + "Description": "Derived model", + "IsNullable": false, + "BaseModel": { + "$ref": "195" + }, + "Usage": "RoundTrip", + "Properties": [ + { + "$id": "199", + "Name": "requiredCollection", + "SerializedName": "requiredCollection", + "Description": "", + "Type": { + "$id": "200", + "Name": "Array", + "ElementType": { + "$ref": "29" + }, + "IsNullable": false + }, + "IsRequired": true, + "IsReadOnly": false, + "IsDiscriminator": false + } + ] } ], "Clients": [ { - "$id": "195", + "$id": "201", "Name": "ModelsInCadlClient", "Description": "CADL project to test various types of models.", "Operations": [ { - "$id": "196", + "$id": "202", "Name": "inputToRoundTrip", "ResourceName": "ModelsInCadl", "Description": "Input model that has property of its own type", "Parameters": [ { - "$id": "197", + "$id": "203", "Name": "input", "NameInRequest": "input", "Type": { @@ -1585,11 +1640,11 @@ "Kind": "Method" }, { - "$id": "198", + "$id": "204", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "199", + "$id": "205", "Name": "String", "Kind": "String", "IsNullable": false @@ -1604,19 +1659,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "200", + "$id": "206", "Type": { - "$ref": "199" + "$ref": "205" }, "Value": "application/json" } }, { - "$id": "201", + "$id": "207", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "202", + "$id": "208", "Name": "String", "Kind": "String", "IsNullable": false @@ -1631,20 +1686,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "203", + "$id": "209", "Type": { - "$ref": "202" + "$ref": "208" }, "Value": "application/json" } }, { - "$id": "204", + "$id": "210", "Name": "apiVersion", "NameInRequest": "api-version", "Description": "", "Type": { - "$id": "205", + "$id": "211", "Name": "String", "Kind": "String", "IsNullable": false @@ -1659,9 +1714,9 @@ "Explode": false, "Kind": "Client", "DefaultValue": { - "$id": "206", + "$id": "212", "Type": { - "$id": "207", + "$id": "213", "Name": "String", "Kind": "String", "IsNullable": false @@ -1672,7 +1727,7 @@ ], "Responses": [ { - "$id": "208", + "$id": "214", "StatusCodes": [ 200 ], @@ -1695,13 +1750,13 @@ "GenerateConvenienceMethod": true }, { - "$id": "209", + "$id": "215", "Name": "inputToRoundTripPrimitive", "ResourceName": "ModelsInCadl", "Description": "Input to RoundTripPrimitive", "Parameters": [ { - "$id": "210", + "$id": "216", "Name": "input", "NameInRequest": "input", "Type": { @@ -1718,11 +1773,11 @@ "Kind": "Method" }, { - "$id": "211", + "$id": "217", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "212", + "$id": "218", "Name": "String", "Kind": "String", "IsNullable": false @@ -1737,19 +1792,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "213", + "$id": "219", "Type": { - "$ref": "212" + "$ref": "218" }, "Value": "application/json" } }, { - "$id": "214", + "$id": "220", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "215", + "$id": "221", "Name": "String", "Kind": "String", "IsNullable": false @@ -1764,20 +1819,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "216", + "$id": "222", "Type": { - "$ref": "215" + "$ref": "221" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "217", + "$id": "223", "StatusCodes": [ 200 ], @@ -1800,13 +1855,13 @@ "GenerateConvenienceMethod": true }, { - "$id": "218", + "$id": "224", "Name": "inputToRoundTripOptional", "ResourceName": "ModelsInCadl", "Description": "Input to RoundTripOptional", "Parameters": [ { - "$id": "219", + "$id": "225", "Name": "input", "NameInRequest": "input", "Type": { @@ -1823,11 +1878,11 @@ "Kind": "Method" }, { - "$id": "220", + "$id": "226", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "221", + "$id": "227", "Name": "String", "Kind": "String", "IsNullable": false @@ -1842,19 +1897,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "222", + "$id": "228", "Type": { - "$ref": "221" + "$ref": "227" }, "Value": "application/json" } }, { - "$id": "223", + "$id": "229", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "224", + "$id": "230", "Name": "String", "Kind": "String", "IsNullable": false @@ -1869,20 +1924,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "225", + "$id": "231", "Type": { - "$ref": "224" + "$ref": "230" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "226", + "$id": "232", "StatusCodes": [ 200 ], @@ -1905,14 +1960,14 @@ "GenerateConvenienceMethod": true }, { - "$id": "227", + "$id": "233", "Name": "inputToRoundTripReadOnly", "ResourceName": "ModelsInCadl", "Deprecated": "deprecated for test", "Description": "Input to RoundTripReadOnly", "Parameters": [ { - "$id": "228", + "$id": "234", "Name": "input", "NameInRequest": "input", "Type": { @@ -1929,11 +1984,11 @@ "Kind": "Method" }, { - "$id": "229", + "$id": "235", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "230", + "$id": "236", "Name": "String", "Kind": "String", "IsNullable": false @@ -1948,19 +2003,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "231", + "$id": "237", "Type": { - "$ref": "230" + "$ref": "236" }, "Value": "application/json" } }, { - "$id": "232", + "$id": "238", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "233", + "$id": "239", "Name": "String", "Kind": "String", "IsNullable": false @@ -1975,20 +2030,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "234", + "$id": "240", "Type": { - "$ref": "233" + "$ref": "239" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "235", + "$id": "241", "StatusCodes": [ 200 ], @@ -2011,13 +2066,13 @@ "GenerateConvenienceMethod": true }, { - "$id": "236", + "$id": "242", "Name": "roundTripToOutput", "ResourceName": "ModelsInCadl", "Description": "RoundTrip to Output", "Parameters": [ { - "$id": "237", + "$id": "243", "Name": "input", "NameInRequest": "input", "Type": { @@ -2034,11 +2089,11 @@ "Kind": "Method" }, { - "$id": "238", + "$id": "244", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "239", + "$id": "245", "Name": "String", "Kind": "String", "IsNullable": false @@ -2053,19 +2108,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "240", + "$id": "246", "Type": { - "$ref": "239" + "$ref": "245" }, "Value": "application/json" } }, { - "$id": "241", + "$id": "247", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "242", + "$id": "248", "Name": "String", "Kind": "String", "IsNullable": false @@ -2080,20 +2135,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "243", + "$id": "249", "Type": { - "$ref": "242" + "$ref": "248" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "244", + "$id": "250", "StatusCodes": [ 200 ], @@ -2116,13 +2171,13 @@ "GenerateConvenienceMethod": true }, { - "$id": "245", + "$id": "251", "Name": "InputRecursive", "ResourceName": "ModelsInCadl", "Description": "Input recursive model", "Parameters": [ { - "$id": "246", + "$id": "252", "Name": "input", "NameInRequest": "input", "Type": { @@ -2139,11 +2194,11 @@ "Kind": "Method" }, { - "$id": "247", + "$id": "253", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "248", + "$id": "254", "Name": "String", "Kind": "String", "IsNullable": false @@ -2158,19 +2213,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "249", + "$id": "255", "Type": { - "$ref": "248" + "$ref": "254" }, "Value": "application/json" } }, { - "$id": "250", + "$id": "256", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "251", + "$id": "257", "Name": "String", "Kind": "String", "IsNullable": false @@ -2185,20 +2240,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "252", + "$id": "258", "Type": { - "$ref": "251" + "$ref": "257" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "253", + "$id": "259", "StatusCodes": [ 200 ], @@ -2218,13 +2273,13 @@ "GenerateConvenienceMethod": true }, { - "$id": "254", + "$id": "260", "Name": "roundTripRecursive", "ResourceName": "ModelsInCadl", "Description": "RoundTrip recursive model", "Parameters": [ { - "$id": "255", + "$id": "261", "Name": "input", "NameInRequest": "input", "Type": { @@ -2241,11 +2296,11 @@ "Kind": "Method" }, { - "$id": "256", + "$id": "262", "Name": "contentType", "NameInRequest": "Content-Type", "Type": { - "$id": "257", + "$id": "263", "Name": "String", "Kind": "String", "IsNullable": false @@ -2260,19 +2315,19 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "258", + "$id": "264", "Type": { - "$ref": "257" + "$ref": "263" }, "Value": "application/json" } }, { - "$id": "259", + "$id": "265", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "260", + "$id": "266", "Name": "String", "Kind": "String", "IsNullable": false @@ -2287,20 +2342,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "261", + "$id": "267", "Type": { - "$ref": "260" + "$ref": "266" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "262", + "$id": "268", "StatusCodes": [ 200 ], @@ -2323,17 +2378,17 @@ "GenerateConvenienceMethod": true }, { - "$id": "263", + "$id": "269", "Name": "selfReference", "ResourceName": "ModelsInCadl", "Description": "Returns model that has property of its own type", "Parameters": [ { - "$id": "264", + "$id": "270", "Name": "accept", "NameInRequest": "Accept", "Type": { - "$id": "265", + "$id": "271", "Name": "String", "Kind": "String", "IsNullable": false @@ -2348,20 +2403,20 @@ "Explode": false, "Kind": "Constant", "DefaultValue": { - "$id": "266", + "$id": "272", "Type": { - "$ref": "265" + "$ref": "271" }, "Value": "application/json" } }, { - "$ref": "204" + "$ref": "210" } ], "Responses": [ { - "$id": "267", + "$id": "273", "StatusCodes": [ 200 ], @@ -2379,10 +2434,115 @@ "Path": "/selfReference", "BufferResponse": true, "GenerateConvenienceMethod": true + }, + { + "$id": "274", + "Name": "roundTripToOutputWithNoUseBase", + "ResourceName": "ModelsInCadl", + "Description": "Returns RoundTripOnNoUse", + "Parameters": [ + { + "$id": "275", + "Name": "input", + "NameInRequest": "input", + "Type": { + "$ref": "198" + }, + "Location": "Body", + "IsRequired": true, + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": false, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Method" + }, + { + "$id": "276", + "Name": "contentType", + "NameInRequest": "Content-Type", + "Type": { + "$id": "277", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Location": "Header", + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": true, + "IsRequired": true, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Constant", + "DefaultValue": { + "$id": "278", + "Type": { + "$ref": "277" + }, + "Value": "application/json" + } + }, + { + "$id": "279", + "Name": "accept", + "NameInRequest": "Accept", + "Type": { + "$id": "280", + "Name": "String", + "Kind": "String", + "IsNullable": false + }, + "Location": "Header", + "IsApiVersion": false, + "IsResourceParameter": false, + "IsContentType": false, + "IsRequired": true, + "IsEndpoint": false, + "SkipUrlEncoding": false, + "Explode": false, + "Kind": "Constant", + "DefaultValue": { + "$id": "281", + "Type": { + "$ref": "280" + }, + "Value": "application/json" + } + }, + { + "$ref": "210" + } + ], + "Responses": [ + { + "$id": "282", + "StatusCodes": [ + 200 + ], + "BodyType": { + "$ref": "198" + }, + "BodyMediaType": "Json", + "Headers": [], + "IsErrorResponse": false + } + ], + "HttpMethod": "GET", + "RequestBodyMediaType": "Json", + "Uri": "", + "Path": "/", + "RequestMediaTypes": [ + "application/json" + ], + "BufferResponse": true, + "GenerateConvenienceMethod": true } ], "Protocol": { - "$id": "268" + "$id": "283" }, "Creatable": true } diff --git a/test/TestProjects/Models-Cadl/Models-Cadl.cadl b/test/TestProjects/Models-Cadl/Models-Cadl.cadl index 88664a8408d..541fc5ea8a7 100644 --- a/test/TestProjects/Models-Cadl/Models-Cadl.cadl +++ b/test/TestProjects/Models-Cadl/Models-Cadl.cadl @@ -406,3 +406,20 @@ op roundTripRecursive(@body input: RoundTripRecursiveModel): RoundTripRecursiveM @get @convenienceAPI op selfReference(): ErrorModel; + +@doc("Base model") +model NoUseBase { + @doc("base model property") + baseModelProp: string; +} + +@doc("Derived model") +model RoundTripOnNoUse extends NoUseBase { + @doc("Required collection") + requiredCollection: CollectionItem[]; +} + +@doc("Returns RoundTripOnNoUse") +@get +@convenienceAPI +op roundTripToOutputWithNoUseBase(@body input: RoundTripOnNoUse): RoundTripOnNoUse; From 436a259522b4641f8af09dec989c4d59b0665948 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Tue, 31 Jan 2023 18:17:57 +0800 Subject: [PATCH 5/9] update test --- .../Generated/Models/APIVersion.cs | 47 +++++++++++++++++ .../Generated/Models/AnomalyDetectionModel.cs | 8 +-- .../Models/MultivariateDetectionResult.cs | 7 +-- samples/AnomalyDetector/Generated/cadl.json | 4 +- .../AnomalyDetector/multivariate/models.cadl | 2 + .../Generated/Models/Cat.Serialization.cs | 51 +------------------ .../Generated/Models/Pet.Serialization.cs | 43 +--------------- .../Generated/Models/Siamese.Serialization.cs | 4 +- .../inheritance/Generated/cadl.json | 4 +- .../Models/NoUseBase.Serialization.cs | 43 +--------------- .../Models/RoundTripOnNoUse.Serialization.cs | 4 +- .../Models-Cadl/Generated/cadl.json | 2 +- 12 files changed, 64 insertions(+), 155 deletions(-) create mode 100644 samples/AnomalyDetector/Generated/Models/APIVersion.cs diff --git a/samples/AnomalyDetector/Generated/Models/APIVersion.cs b/samples/AnomalyDetector/Generated/Models/APIVersion.cs new file mode 100644 index 00000000000..85223b941cf --- /dev/null +++ b/samples/AnomalyDetector/Generated/Models/APIVersion.cs @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +// + +#nullable disable + +using System; +using System.ComponentModel; + +namespace AnomalyDetector.Models +{ + public readonly partial struct APIVersion : IEquatable + { + private readonly string _value; + + /// Initializes a new instance of . + /// is null. + public APIVersion(string value) + { + _value = value ?? throw new ArgumentNullException(nameof(value)); + } + + private const string V11Value = "v1.1"; + + /// v1.1. + public static APIVersion V11 { get; } = new APIVersion(V11Value); + /// Determines if two values are the same. + public static bool operator ==(APIVersion left, APIVersion right) => left.Equals(right); + /// Determines if two values are not the same. + public static bool operator !=(APIVersion left, APIVersion right) => !left.Equals(right); + /// Converts a string to a . + public static implicit operator APIVersion(string value) => new APIVersion(value); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override bool Equals(object obj) => obj is APIVersion other && Equals(other); + /// + public bool Equals(APIVersion other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); + + /// + [EditorBrowsable(EditorBrowsableState.Never)] + public override int GetHashCode() => _value?.GetHashCode() ?? 0; + /// + public override string ToString() => _value; + } +} diff --git a/samples/AnomalyDetector/Generated/Models/AnomalyDetectionModel.cs b/samples/AnomalyDetector/Generated/Models/AnomalyDetectionModel.cs index 5f48b0eec9c..d89dbd486b3 100644 --- a/samples/AnomalyDetector/Generated/Models/AnomalyDetectionModel.cs +++ b/samples/AnomalyDetector/Generated/Models/AnomalyDetectionModel.cs @@ -6,7 +6,6 @@ #nullable disable using System; -using Azure.Core; namespace AnomalyDetector.Models { @@ -14,15 +13,10 @@ namespace AnomalyDetector.Models public partial class AnomalyDetectionModel { /// Initializes a new instance of AnomalyDetectionModel. - /// /// /// - /// is null. - internal AnomalyDetectionModel(string modelId, DateTimeOffset createdTime, DateTimeOffset lastUpdatedTime) + internal AnomalyDetectionModel(DateTimeOffset createdTime, DateTimeOffset lastUpdatedTime) { - Argument.AssertNotNull(modelId, nameof(modelId)); - - ModelId = modelId; CreatedTime = createdTime; LastUpdatedTime = lastUpdatedTime; } diff --git a/samples/AnomalyDetector/Generated/Models/MultivariateDetectionResult.cs b/samples/AnomalyDetector/Generated/Models/MultivariateDetectionResult.cs index 1ff9f5c18db..9eaaab788be 100644 --- a/samples/AnomalyDetector/Generated/Models/MultivariateDetectionResult.cs +++ b/samples/AnomalyDetector/Generated/Models/MultivariateDetectionResult.cs @@ -16,17 +16,14 @@ namespace AnomalyDetector.Models public partial class MultivariateDetectionResult { /// Initializes a new instance of MultivariateDetectionResult. - /// /// /// - /// , or is null. - internal MultivariateDetectionResult(string resultId, MultivariateBatchDetectionResultSummary summary, IEnumerable results) + /// or is null. + internal MultivariateDetectionResult(MultivariateBatchDetectionResultSummary summary, IEnumerable results) { - Argument.AssertNotNull(resultId, nameof(resultId)); Argument.AssertNotNull(summary, nameof(summary)); Argument.AssertNotNull(results, nameof(results)); - ResultId = resultId; Summary = summary; Results = results.ToList(); } diff --git a/samples/AnomalyDetector/Generated/cadl.json b/samples/AnomalyDetector/Generated/cadl.json index f7f0e21ab32..9b7dbdcd122 100644 --- a/samples/AnomalyDetector/Generated/cadl.json +++ b/samples/AnomalyDetector/Generated/cadl.json @@ -930,7 +930,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { @@ -1783,7 +1783,7 @@ "IsNullable": false }, "IsRequired": true, - "IsReadOnly": false, + "IsReadOnly": true, "IsDiscriminator": false }, { diff --git a/samples/AnomalyDetector/multivariate/models.cadl b/samples/AnomalyDetector/multivariate/models.cadl index 64e238a2ce2..939d8252026 100644 --- a/samples/AnomalyDetector/multivariate/models.cadl +++ b/samples/AnomalyDetector/multivariate/models.cadl @@ -51,6 +51,7 @@ enum ModelStatus { model MultivariateDetectionResult { @doc("Result identifier, which is used to fetch the results of an inference call.") @key + @visibility("read") @format("uuid") resultId: string; @@ -309,6 +310,7 @@ epoch. model AnomalyDetectionModel { @doc("Model identifier.") @key + @visibility("read") @format("uuid") modelId: string; diff --git a/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs b/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs index 33f257d9210..ef720892c18 100644 --- a/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs +++ b/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs @@ -5,58 +5,9 @@ #nullable disable -using System.Text.Json; -using Azure; -using Azure.Core; - namespace Models.Inheritance.Models { - public partial class Cat : IUtf8JsonSerializable + public partial class Cat { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("age"); - writer.WriteNumberValue(Age); - writer.WritePropertyName("name"); - writer.WriteStringValue(Name); - writer.WriteEndObject(); - } - - internal static Cat DeserializeCat(JsonElement element) - { - int age = default; - string name = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("age")) - { - age = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("name")) - { - name = property.Value.GetString(); - continue; - } - } - return new Cat(name, age); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal new static Cat FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content); - return DeserializeCat(document.RootElement); - } - - /// Convert into a Utf8JsonRequestContent. - internal override RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs b/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs index 49831f40e9d..0f926baada2 100644 --- a/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs +++ b/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs @@ -5,50 +5,9 @@ #nullable disable -using System.Text.Json; -using Azure; -using Azure.Core; - namespace Models.Inheritance.Models { - public partial class Pet : IUtf8JsonSerializable + public partial class Pet { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("name"); - writer.WriteStringValue(Name); - writer.WriteEndObject(); - } - - internal static Pet DeserializePet(JsonElement element) - { - string name = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("name")) - { - name = property.Value.GetString(); - continue; - } - } - return new Pet(name); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static Pet FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content); - return DeserializePet(document.RootElement); - } - - /// Convert into a Utf8JsonRequestContent. - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/test/CadlRanchProjects/inheritance/Generated/Models/Siamese.Serialization.cs b/test/CadlRanchProjects/inheritance/Generated/Models/Siamese.Serialization.cs index 7c0eca23b60..f38534c39b0 100644 --- a/test/CadlRanchProjects/inheritance/Generated/Models/Siamese.Serialization.cs +++ b/test/CadlRanchProjects/inheritance/Generated/Models/Siamese.Serialization.cs @@ -53,14 +53,14 @@ internal static Siamese DeserializeSiamese(JsonElement element) /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal new static Siamese FromResponse(Response response) + internal static Siamese FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); return DeserializeSiamese(document.RootElement); } /// Convert into a Utf8JsonRequestContent. - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/test/CadlRanchProjects/inheritance/Generated/cadl.json b/test/CadlRanchProjects/inheritance/Generated/cadl.json index 22b432f9c76..9af57368e70 100644 --- a/test/CadlRanchProjects/inheritance/Generated/cadl.json +++ b/test/CadlRanchProjects/inheritance/Generated/cadl.json @@ -13,7 +13,7 @@ "Namespace": "Models.Inheritance", "Description": "This is base model for non-discriminator normal multiple levels inheritance.", "IsNullable": false, - "Usage": "RoundTrip", + "Usage": "None", "Properties": [ { "$id": "3", @@ -41,7 +41,7 @@ "BaseModel": { "$ref": "2" }, - "Usage": "RoundTrip", + "Usage": "None", "Properties": [ { "$id": "6", diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs index 43d73320c6d..feda30e3c41 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs @@ -5,50 +5,9 @@ #nullable disable -using System.Text.Json; -using Azure; -using Azure.Core; - namespace ModelsInCadl.Models { - public partial class NoUseBase : IUtf8JsonSerializable + public partial class NoUseBase { - void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) - { - writer.WriteStartObject(); - writer.WritePropertyName("baseModelProp"); - writer.WriteStringValue(BaseModelProp); - writer.WriteEndObject(); - } - - internal static NoUseBase DeserializeNoUseBase(JsonElement element) - { - string baseModelProp = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("baseModelProp")) - { - baseModelProp = property.Value.GetString(); - continue; - } - } - return new NoUseBase(baseModelProp); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static NoUseBase FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content); - return DeserializeNoUseBase(document.RootElement); - } - - /// Convert into a Utf8JsonRequestContent. - internal virtual RequestContent ToRequestContent() - { - var content = new Utf8JsonRequestContent(); - content.JsonWriter.WriteObjectValue(this); - return content; - } } } diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs index 702d57d9016..3ce3d6737af 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs @@ -56,14 +56,14 @@ internal static RoundTripOnNoUse DeserializeRoundTripOnNoUse(JsonElement element /// Deserializes the model from a raw response. /// The response to deserialize the model from. - internal new static RoundTripOnNoUse FromResponse(Response response) + internal static RoundTripOnNoUse FromResponse(Response response) { using var document = JsonDocument.Parse(response.Content); return DeserializeRoundTripOnNoUse(document.RootElement); } /// Convert into a Utf8JsonRequestContent. - internal override RequestContent ToRequestContent() + internal virtual RequestContent ToRequestContent() { var content = new Utf8JsonRequestContent(); content.JsonWriter.WriteObjectValue(this); diff --git a/test/TestProjects/Models-Cadl/Generated/cadl.json b/test/TestProjects/Models-Cadl/Generated/cadl.json index 885070ad7b3..5f94a4075fc 100644 --- a/test/TestProjects/Models-Cadl/Generated/cadl.json +++ b/test/TestProjects/Models-Cadl/Generated/cadl.json @@ -1560,7 +1560,7 @@ "Namespace": "ModelsInCadl", "Description": "Base model", "IsNullable": false, - "Usage": "RoundTrip", + "Usage": "None", "Properties": [ { "$id": "196", From db79dcd012bde693b005a754d795550675a4ca2d Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Wed, 1 Feb 2023 11:12:23 +0800 Subject: [PATCH 6/9] update test --- .../Generated/Docs/ModelsInCadlClient.xml | 24 +++++++++---------- .../Models-Cadl/Generated/Models/NoUseBase.cs | 4 ++-- .../Generated/Models/RoundTripOnNoUse.cs | 10 ++++---- .../Models-Cadl/Generated/cadl.json | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml b/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml index ac88a23c62c..ad389842efb 100644 --- a/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml +++ b/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml @@ -1285,10 +1285,10 @@ Schema for RoundTripOnNoUse: { requiredCollection: [ { - requiredModelRecord: Dictionary<string, RecordItem>, # Required. + requiredModelRecord: Dictionary<string, RecordItem>, # Required. Required model record } - ], # Required. - baseModelProp: string, # Required. + ], # Required. Required collection + baseModelProp: string, # Required. base model property } @@ -1298,10 +1298,10 @@ Schema for RoundTripOnNoUse: { requiredCollection: [ { - requiredModelRecord: Dictionary<string, RecordItem>, # Required. + requiredModelRecord: Dictionary<string, RecordItem>, # Required. Required model record } - ], # Required. - baseModelProp: string, # Required. + ], # Required. Required collection + baseModelProp: string, # Required. base model property } @@ -1341,10 +1341,10 @@ Schema for RoundTripOnNoUse: { requiredCollection: [ { - requiredModelRecord: Dictionary<string, RecordItem>, # Required. + requiredModelRecord: Dictionary<string, RecordItem>, # Required. Required model record } - ], # Required. - baseModelProp: string, # Required. + ], # Required. Required collection + baseModelProp: string, # Required. base model property } @@ -1354,10 +1354,10 @@ Schema for RoundTripOnNoUse: { requiredCollection: [ { - requiredModelRecord: Dictionary<string, RecordItem>, # Required. + requiredModelRecord: Dictionary<string, RecordItem>, # Required. Required model record } - ], # Required. - baseModelProp: string, # Required. + ], # Required. Required collection + baseModelProp: string, # Required. base model property } diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs index fe81e016bb2..08487083d57 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs @@ -14,7 +14,7 @@ namespace ModelsInCadl.Models public partial class NoUseBase { /// Initializes a new instance of NoUseBase. - /// + /// base model property. /// is null. public NoUseBase(string baseModelProp) { @@ -23,7 +23,7 @@ public NoUseBase(string baseModelProp) BaseModelProp = baseModelProp; } - /// Gets or sets the base model prop. + /// base model property. public string BaseModelProp { get; set; } } } diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs index e03787b041c..aa67ac07bd6 100644 --- a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs +++ b/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs @@ -16,8 +16,8 @@ namespace ModelsInCadl.Models public partial class RoundTripOnNoUse : NoUseBase { /// Initializes a new instance of RoundTripOnNoUse. - /// - /// + /// base model property. + /// Required collection. /// or is null. public RoundTripOnNoUse(string baseModelProp, IEnumerable requiredCollection) : base(baseModelProp) { @@ -28,8 +28,8 @@ public RoundTripOnNoUse(string baseModelProp, IEnumerable requir } /// Initializes a new instance of RoundTripOnNoUse. - /// - /// + /// base model property. + /// Required collection. /// is null. internal RoundTripOnNoUse(string baseModelProp, IList requiredCollection) : base(baseModelProp) { @@ -38,7 +38,7 @@ internal RoundTripOnNoUse(string baseModelProp, IList requiredCo RequiredCollection = requiredCollection.ToList(); } - /// Gets the required collection. + /// Required collection. public IList RequiredCollection { get; } } } diff --git a/test/TestProjects/Models-Cadl/Generated/cadl.json b/test/TestProjects/Models-Cadl/Generated/cadl.json index e166cbe3b48..12464b615f9 100644 --- a/test/TestProjects/Models-Cadl/Generated/cadl.json +++ b/test/TestProjects/Models-Cadl/Generated/cadl.json @@ -1566,7 +1566,7 @@ "$id": "196", "Name": "baseModelProp", "SerializedName": "baseModelProp", - "Description": "", + "Description": "base model property", "Type": { "$id": "197", "Name": "string", @@ -1594,7 +1594,7 @@ "$id": "199", "Name": "requiredCollection", "SerializedName": "requiredCollection", - "Description": "", + "Description": "Required collection", "Type": { "$id": "200", "Name": "Array", From 54a3cbbe910ff067ce1885384d872870833aa9a1 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Wed, 1 Feb 2023 13:50:36 +0800 Subject: [PATCH 7/9] don't generate Serailization class when model usage is none --- .../Generation/Writers/SerializationWriter.cs | 5 ++++- .../Generated/Models/Cat.Serialization.cs | 13 ------------- .../Generated/Models/Pet.Serialization.cs | 13 ------------- .../Generated/Models/NoUseBase.Serialization.cs | 13 ------------- 4 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs delete mode 100644 test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs delete mode 100644 test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs diff --git a/src/AutoRest.CSharp/Common/Generation/Writers/SerializationWriter.cs b/src/AutoRest.CSharp/Common/Generation/Writers/SerializationWriter.cs index b80fef6e64d..bea06754381 100644 --- a/src/AutoRest.CSharp/Common/Generation/Writers/SerializationWriter.cs +++ b/src/AutoRest.CSharp/Common/Generation/Writers/SerializationWriter.cs @@ -29,7 +29,10 @@ public void WriteSerialization(CodeWriter writer, TypeProvider schema) switch (schema) { case SerializableObjectType objectSchema: - WriteObjectSerialization(writer, objectSchema); + if (objectSchema.IncludeSerializer || objectSchema.IncludeDeserializer) + { + WriteObjectSerialization(writer, objectSchema); + } break; case EnumType { IsExtensible: false } sealedChoiceSchema: WriteEnumSerialization(writer, sealedChoiceSchema); diff --git a/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs b/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs deleted file mode 100644 index ef720892c18..00000000000 --- a/test/CadlRanchProjects/inheritance/Generated/Models/Cat.Serialization.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Models.Inheritance.Models -{ - public partial class Cat - { - } -} diff --git a/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs b/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs deleted file mode 100644 index 0f926baada2..00000000000 --- a/test/CadlRanchProjects/inheritance/Generated/Models/Pet.Serialization.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace Models.Inheritance.Models -{ - public partial class Pet - { - } -} diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs b/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs deleted file mode 100644 index feda30e3c41..00000000000 --- a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.Serialization.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace ModelsInCadl.Models -{ - public partial class NoUseBase - { - } -} From 077065f28867a7efcfe6050503f90a475ffd4dd1 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Wed, 1 Feb 2023 15:23:37 +0800 Subject: [PATCH 8/9] update test --- .../Generated/Models/GenericUrl.Serialization.cs | 13 ------------- .../Generated/Models/ProductUrl.Serialization.cs | 13 ------------- 2 files changed, 26 deletions(-) delete mode 100644 test/TestServerProjects/model-flattening/Generated/Models/GenericUrl.Serialization.cs delete mode 100644 test/TestServerProjects/model-flattening/Generated/Models/ProductUrl.Serialization.cs diff --git a/test/TestServerProjects/model-flattening/Generated/Models/GenericUrl.Serialization.cs b/test/TestServerProjects/model-flattening/Generated/Models/GenericUrl.Serialization.cs deleted file mode 100644 index ce6888409de..00000000000 --- a/test/TestServerProjects/model-flattening/Generated/Models/GenericUrl.Serialization.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace model_flattening.Models -{ - internal partial class GenericUrl - { - } -} diff --git a/test/TestServerProjects/model-flattening/Generated/Models/ProductUrl.Serialization.cs b/test/TestServerProjects/model-flattening/Generated/Models/ProductUrl.Serialization.cs deleted file mode 100644 index 3a58051abf6..00000000000 --- a/test/TestServerProjects/model-flattening/Generated/Models/ProductUrl.Serialization.cs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -namespace model_flattening.Models -{ - internal partial class ProductUrl - { - } -} From b0436fbd58082b00f745f9f8728bb12ebfb08041 Mon Sep 17 00:00:00 2001 From: chunyu3 Date: Wed, 1 Feb 2023 17:04:11 +0800 Subject: [PATCH 9/9] update emitter options for sample project --- eng/Generate.ps1 | 2 +- .../Generated/Configuration.json | 3 +- .../Generated/Models/APIVersion.cs | 47 -------------- .../Models/ModelList.Serialization.cs | 62 ------------------- .../Generated/Models/ModelList.cs | 54 ---------------- 5 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 samples/AnomalyDetector/Generated/Models/APIVersion.cs delete mode 100644 samples/AnomalyDetector/Generated/Models/ModelList.Serialization.cs delete mode 100644 samples/AnomalyDetector/Generated/Models/ModelList.cs diff --git a/eng/Generate.ps1 b/eng/Generate.ps1 index 5fbb2a66fe5..b5ae5e897a0 100644 --- a/eng/Generate.ps1 +++ b/eng/Generate.ps1 @@ -250,7 +250,7 @@ if (!($Exclude -contains "Samples")) $cadlMain = Join-Path $projectDirectory "main.cadl" $cadlClient = Join-Path $projectDirectory "client.cadl" $mainCadlFile = If (Test-Path "$cadlClient") { Resolve-Path "$cadlClient" } Else { Resolve-Path "$cadlMain"} - Add-Cadl $projectName $projectDirectory $mainCadlFile "--option @azure-tools/cadl-csharp.generateConvenienceAPI=true --option @azure-tools/cadl-csharp.unreferenced-types-handling=keepAll" + Add-Cadl $projectName $projectDirectory $mainCadlFile "--option @azure-tools/cadl-csharp.generateConvenienceAPI=true" } } diff --git a/samples/AnomalyDetector/Generated/Configuration.json b/samples/AnomalyDetector/Generated/Configuration.json index af2e40acccf..0bc117d4938 100644 --- a/samples/AnomalyDetector/Generated/Configuration.json +++ b/samples/AnomalyDetector/Generated/Configuration.json @@ -5,6 +5,5 @@ "SharedSourceFolders": [ "../../../artifacts/bin/AutoRest.CSharp/Debug/net6.0/Generator.Shared", "../../../artifacts/bin/AutoRest.CSharp/Debug/net6.0/Azure.Core.Shared" - ], - "unreferenced-types-handling": "keepAll" + ] } diff --git a/samples/AnomalyDetector/Generated/Models/APIVersion.cs b/samples/AnomalyDetector/Generated/Models/APIVersion.cs deleted file mode 100644 index 85223b941cf..00000000000 --- a/samples/AnomalyDetector/Generated/Models/APIVersion.cs +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.ComponentModel; - -namespace AnomalyDetector.Models -{ - public readonly partial struct APIVersion : IEquatable - { - private readonly string _value; - - /// Initializes a new instance of . - /// is null. - public APIVersion(string value) - { - _value = value ?? throw new ArgumentNullException(nameof(value)); - } - - private const string V11Value = "v1.1"; - - /// v1.1. - public static APIVersion V11 { get; } = new APIVersion(V11Value); - /// Determines if two values are the same. - public static bool operator ==(APIVersion left, APIVersion right) => left.Equals(right); - /// Determines if two values are not the same. - public static bool operator !=(APIVersion left, APIVersion right) => !left.Equals(right); - /// Converts a string to a . - public static implicit operator APIVersion(string value) => new APIVersion(value); - - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override bool Equals(object obj) => obj is APIVersion other && Equals(other); - /// - public bool Equals(APIVersion other) => string.Equals(_value, other._value, StringComparison.InvariantCultureIgnoreCase); - - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public override int GetHashCode() => _value?.GetHashCode() ?? 0; - /// - public override string ToString() => _value; - } -} diff --git a/samples/AnomalyDetector/Generated/Models/ModelList.Serialization.cs b/samples/AnomalyDetector/Generated/Models/ModelList.Serialization.cs deleted file mode 100644 index 08343e8fda1..00000000000 --- a/samples/AnomalyDetector/Generated/Models/ModelList.Serialization.cs +++ /dev/null @@ -1,62 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System.Collections.Generic; -using System.Text.Json; -using Azure; -using Azure.Core; - -namespace AnomalyDetector.Models -{ - public partial class ModelList - { - internal static ModelList DeserializeModelList(JsonElement element) - { - IReadOnlyList models = default; - int currentCount = default; - int maxCount = default; - Optional nextLink = default; - foreach (var property in element.EnumerateObject()) - { - if (property.NameEquals("models")) - { - List array = new List(); - foreach (var item in property.Value.EnumerateArray()) - { - array.Add(AnomalyDetectionModel.DeserializeAnomalyDetectionModel(item)); - } - models = array; - continue; - } - if (property.NameEquals("currentCount")) - { - currentCount = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("maxCount")) - { - maxCount = property.Value.GetInt32(); - continue; - } - if (property.NameEquals("nextLink")) - { - nextLink = property.Value.GetString(); - continue; - } - } - return new ModelList(models, currentCount, maxCount, nextLink); - } - - /// Deserializes the model from a raw response. - /// The response to deserialize the model from. - internal static ModelList FromResponse(Response response) - { - using var document = JsonDocument.Parse(response.Content); - return DeserializeModelList(document.RootElement); - } - } -} diff --git a/samples/AnomalyDetector/Generated/Models/ModelList.cs b/samples/AnomalyDetector/Generated/Models/ModelList.cs deleted file mode 100644 index bbc47e0ca7a..00000000000 --- a/samples/AnomalyDetector/Generated/Models/ModelList.cs +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -// - -#nullable disable - -using System; -using System.Collections.Generic; -using System.Linq; -using Azure.Core; - -namespace AnomalyDetector.Models -{ - /// Response of listing models. - public partial class ModelList - { - /// Initializes a new instance of ModelList. - /// List of models. - /// Number of trained multivariate models. - /// Maximum number of models that can be trained for this Anomaly Detector resource. - /// is null. - internal ModelList(IEnumerable models, int currentCount, int maxCount) - { - Argument.AssertNotNull(models, nameof(models)); - - Models = models.ToList(); - CurrentCount = currentCount; - MaxCount = maxCount; - } - - /// Initializes a new instance of ModelList. - /// List of models. - /// Number of trained multivariate models. - /// Maximum number of models that can be trained for this Anomaly Detector resource. - /// The link to fetch more models. - internal ModelList(IReadOnlyList models, int currentCount, int maxCount, string nextLink) - { - Models = models.ToList(); - CurrentCount = currentCount; - MaxCount = maxCount; - NextLink = nextLink; - } - - /// List of models. - public IReadOnlyList Models { get; } - /// Number of trained multivariate models. - public int CurrentCount { get; } - /// Maximum number of models that can be trained for this Anomaly Detector resource. - public int MaxCount { get; } - /// The link to fetch more models. - public string NextLink { get; } - } -}