diff --git a/eng/ExecuteCadlEmitterUnitTests.ps1 b/eng/ExecuteTypespecEmitterUnitTests.ps1
similarity index 66%
rename from eng/ExecuteCadlEmitterUnitTests.ps1
rename to eng/ExecuteTypespecEmitterUnitTests.ps1
index 4968cdad6db..2da7153f9d6 100644
--- a/eng/ExecuteCadlEmitterUnitTests.ps1
+++ b/eng/ExecuteTypespecEmitterUnitTests.ps1
@@ -4,11 +4,11 @@ $ErrorActionPreference = 'Stop'
Set-StrictMode -Version 1
Write-Host 'Generating test CADL json...'
-& (Join-Path $PSScriptRoot 'CadlGenerate.ps1')
+& (Join-Path $PSScriptRoot 'TypespecGenerate.ps1')
Write-Host 'Checking generated file differences...'
git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code
if ($LastExitCode -ne 0)
{
- Write-Error 'Generated code is not up to date, please run CadlGenerate.ps1'
+ Write-Error 'Generated code is not up to date, please run TypespecGenerate.ps1'
}
\ No newline at end of file
diff --git a/eng/Generate.ps1 b/eng/Generate.ps1
index 6618c8a40b6..aee3e19b087 100644
--- a/eng/Generate.ps1
+++ b/eng/Generate.ps1
@@ -19,7 +19,7 @@ $sharedSource = Join-Path $repoRoot 'src' 'assets'
$configurationPath = Join-Path $repoRoot 'readme.md'
$testServerSwaggerPath = Join-Path $repoRoot 'node_modules' '@microsoft.azure' 'autorest.testserver' 'swagger'
$cadlRanchFilePath = Join-Path $repoRoot 'node_modules' '@azure-tools' 'cadl-ranch-specs' 'http'
-$cadlEmitOptions = '--option @azure-tools/cadl-csharp.save-inputs=true --option @azure-tools/cadl-csharp.clear-output-folder=true'
+$cadlEmitOptions = '--option @azure-tools/typespec-csharp.save-inputs=true --option @azure-tools/typespec-csharp.clear-output-folder=true'
function Add-Swagger ([string]$name, [string]$output, [string]$arguments) {
$swaggerDefinitions[$name] = @{
@@ -37,7 +37,7 @@ function Add-Swagger-Test ([string]$name, [string]$output, [string]$arguments) {
}
}
-function Add-Cadl([string]$name, [string]$output, [string]$mainFile="", [string]$arguments="") {
+function Add-Typespec([string]$name, [string]$output, [string]$mainFile="", [string]$arguments="") {
$cadlDefinitions[$name] = @{
'projectName'=$name;
'output'=$output;
@@ -53,11 +53,11 @@ function Add-TestServer-Swagger ([string]$testName, [string]$projectSuffix, [str
Add-Swagger "$testName$projectSuffix" $projectDirectory "--require=$configurationPath --try-require=$inputReadme --input-file=$inputFile $additionalArgs"
}
-function Add-CadlRanch-Cadl([string]$testName, [string]$projectPrefix, [string]$cadlRanchProjectsDirectory, [boolean]$generateConvenience) {
+function Add-CadlRanch-Typespec([string]$testName, [string]$projectPrefix, [string]$cadlRanchProjectsDirectory, [boolean]$generateConvenience) {
$projectDirectory = Join-Path $cadlRanchProjectsDirectory $testName
$cadlMain = Join-Path $cadlRanchFilePath $testName "main.cadl"
- $convenienceOption = If ($generateConvenience) {""} Else {" --option @azure-tools/cadl-csharp.generate-convenience-methods=false"}
- Add-Cadl "$projectPrefix$testName" $projectDirectory $cadlMain "--option @azure-tools/cadl-csharp.unreferenced-types-handling=keepAll$convenienceOption"
+ $convenienceOption = If ($generateConvenience) {""} Else {" --option @azure-tools/typespec-csharp.generate-convenience-methods=false"}
+ Add-Typespec "$projectPrefix$testName" $projectDirectory $cadlMain "--option @azure-tools/typespec-csharp.unreferenced-types-handling=keepAll$convenienceOption"
}
$testNames =
@@ -168,8 +168,8 @@ function Add-Directory ([string]$testName, [string]$directory, [boolean]$forTest
Add-Swagger-Test $testName $directory $testArguments
}
else {
- if ($testName.EndsWith("Cadl")) {
- Add-Cadl $testName $directory
+ if ($testName.EndsWith("Typespec")) {
+ Add-Typespec $testName $directory
} else {
Add-Swagger $testName $directory $testArguments
}
@@ -194,8 +194,8 @@ if (!($Exclude -contains "TestProjects"))
Add-Directory $testName $testsFolder $TRUE
continue
}
- if ($testName.EndsWith("Cadl")) {
- Add-Cadl $testName $directory "" "--option @azure-tools/cadl-csharp.generate-convenience-methods=false"
+ if ($testName.EndsWith("Typespec")) {
+ Add-Typespec $testName $directory "" "--option @azure-tools/typespec-csharp.generate-convenience-methods=false"
} else {
if (Test-Path $readmeConfigurationPath)
{
@@ -244,14 +244,14 @@ if (!($Exclude -contains "Samples"))
foreach ($projectName in $cadlSampleProjectName)
{
$projectDirectory = Join-Path $repoRoot 'samples' $projectName
- $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
+ $tspMain = Join-Path $projectDirectory "main.tsp"
+ $tspClient = Join-Path $projectDirectory "client.tsp"
+ $mainTspFile = If (Test-Path "$tspClient") { Resolve-Path "$tspClient" } Else { Resolve-Path "$tspMain"}
+ Add-Typespec $projectName $projectDirectory $mainTspFile
}
}
-# Cadl projects
+# Typespec projects
$cadlRanchProjectDirectory = Join-Path $repoRoot 'test' 'CadlRanchProjects'
$cadlRanchProjectPathsWithoutConvenience = # Needs justification to add item
'enums/extensible', # https://github.com/Azure/autorest.csharp/issues/3079
@@ -271,17 +271,17 @@ if (!($Exclude -contains "CadlRanchProjects"))
{
foreach ($testPath in $cadlRanchProjectPaths)
{
- Add-CadlRanch-Cadl $testPath "cadl-" $cadlRanchProjectDirectory $TRUE
+ Add-CadlRanch-Typespec $testPath "typespec-" $cadlRanchProjectDirectory $TRUE
}
foreach ($testPath in $cadlRanchProjectPathsWithoutConvenience)
{
- Add-CadlRanch-Cadl $testPath "cadl-" $cadlRanchProjectDirectory $FALSE
+ Add-CadlRanch-Typespec $testPath "typespec-" $cadlRanchProjectDirectory $FALSE
}
}
# TODO: remove later after cadl-ranch fixes the discriminator tests
-Add-Cadl "inheritance-cadl" (Join-Path $cadlRanchProjectDirectory "inheritance")
+Add-Typespec "inheritance-typespec" (Join-Path $cadlRanchProjectDirectory "inheritance")
# Smoke tests
if (!($Exclude -contains "SmokeTests"))
@@ -380,7 +380,7 @@ if ($reset -or $env:TF_BUILD)
if ($cadlCount -gt 0)
{
- Invoke-CadlSetup
+ Invoke-TypespecSetup
}
}
@@ -411,6 +411,6 @@ $keys | %{ $swaggerTestDefinitions[$_] } | ForEach-Object -Parallel {
$keys | %{ $cadlDefinitions[$_] } | ForEach-Object -Parallel {
if ($_.output -ne $null) {
Import-Module "$using:PSScriptRoot\Generation.psm1" -DisableNameChecking;
- Invoke-Cadl $_.output $_.projectName $_.mainFile $_.arguments $using:sharedSource $using:fast $using:debug;
+ Invoke-Typespec $_.output $_.projectName $_.mainFile $_.arguments $using:sharedSource $using:fast $using:debug;
}
} -ThrottleLimit $parallel
diff --git a/eng/Generation.psm1 b/eng/Generation.psm1
index 61e65d11079..e96b664720d 100644
--- a/eng/Generation.psm1
+++ b/eng/Generation.psm1
@@ -50,7 +50,7 @@ function AutoRest-Reset()
Invoke "$script:autoRestBinary --reset"
}
-function Invoke-Cadl($baseOutput, $projectName, $mainFile, $arguments="", $sharedSource="", $fast="", $debug="")
+function Invoke-Typespec($baseOutput, $projectName, $mainFile, $arguments="", $sharedSource="", $fast="", $debug="")
{
if (!(Test-Path $baseOutput)) {
New-Item $baseOutput -ItemType Directory
@@ -81,8 +81,8 @@ function Invoke-Cadl($baseOutput, $projectName, $mainFile, $arguments="", $share
$autorestCsharpBinPath = Join-Path $repoRootPath "artifacts/bin/AutoRest.CSharp/Debug/net6.0/AutoRest.CSharp.dll"
Try
{
- $cadlFileName = $mainFile ? $mainFile : "$baseOutput/$projectName.cadl"
- $emitCommand = "npx cadl compile $cadlFileName --emit @azure-tools/cadl-csharp --option @azure-tools/cadl-csharp.emitter-output-dir=$outputPath --option @azure-tools/cadl-csharp.csharpGeneratorPath=$autorestCsharpBinPath $arguments"
+ $cadlFileName = $mainFile ? $mainFile : "$baseOutput/$projectName.tsp"
+ $emitCommand = "npx tsp compile $cadlFileName --emit @azure-tools/typespec-csharp --option @azure-tools/typespec-csharp.emitter-output-dir=$outputPath --option @azure-tools/typespec-csharp.csharpGeneratorPath=$autorestCsharpBinPath $arguments"
Invoke $emitCommand $outputPath
}
Finally
@@ -94,7 +94,7 @@ function Invoke-Cadl($baseOutput, $projectName, $mainFile, $arguments="", $share
Invoke "dotnet build $baseOutput --verbosity quiet /nologo"
}
-function Invoke-CadlSetup()
+function Invoke-TypespecSetup()
{
# build emitter
$emitterPath = Join-Path $PSScriptRoot ".." "src" "CADL.Extension" "Emitter.Csharp"
@@ -133,5 +133,5 @@ Export-ModuleMember -Function "Invoke"
Export-ModuleMember -Function "Invoke-AutoRest"
Export-ModuleMember -Function "AutoRest-Reset"
Export-ModuleMember -Function "Get-AutoRestProject"
-Export-ModuleMember -Function "Invoke-Cadl"
-Export-ModuleMember -Function "Invoke-CadlSetup"
+Export-ModuleMember -Function "Invoke-Typespec"
+Export-ModuleMember -Function "Invoke-TypespecSetup"
diff --git a/eng/CadlGenerate.ps1 b/eng/TypespecGenerate.ps1
similarity index 65%
rename from eng/CadlGenerate.ps1
rename to eng/TypespecGenerate.ps1
index a28137d3411..94e849c952a 100644
--- a/eng/CadlGenerate.ps1
+++ b/eng/TypespecGenerate.ps1
@@ -23,7 +23,7 @@ foreach ($directory in Get-ChildItem $testEmitterPath -Directory)
{
Remove-Item $projectPath/Generated -Force -Recurse
}
- node node_modules/@cadl-lang/compiler/dist/core/cli.js compile $projectPath/$testName.cadl --emit @azure-tools/cadl-csharp --option @azure-tools/cadl-csharp.emitter-output-dir=$projectPath --option @azure-tools/cadl-csharp.skipSDKGeneration=true --option @azure-tools/cadl-csharp.save-inputs=true
+ node node_modules/@typespec/compiler/dist/core/cli/cli.js compile $projectPath/$testName.tsp --emit @azure-tools/typespec-csharp --option @azure-tools/typespec-csharp.emitter-output-dir=$projectPath --option @azure-tools/typespec-csharp.skipSDKGeneration=true --option @azure-tools/typespec-csharp.save-inputs=true
if (!$?) {
Pop-Location
throw "Failed to emit cadl model for $testName."
@@ -47,10 +47,10 @@ foreach ($directory in Get-ChildItem $samplePath -Directory)
{
Remove-Item $projectPath/Generated -Force -Recurse
}
- node node_modules/@cadl-lang/compiler/dist/core/cli.js compile $projectPath/$testName.cadl --emit @azure-tools/cadl-csharp --option @azure-tools/cadl-csharp.emitter-output-dir=$projectPath --option @azure-tools/cadl-csharp.skipSDKGeneration=true --option @azure-tools/cadl-csharp.save-inputs=true
+ node node_modules/@typespec/compiler/dist/core/cli/cli.js compile $projectPath/$testName.tsp --emit @azure-tools/typespec-csharp --option @azure-tools/typespec-csharp.emitter-output-dir=$projectPath --option @azure-tools/typespec-csharp.skipSDKGeneration=true --option @azure-tools/typespec-csharp.save-inputs=true
if (!$?) {
Pop-Location
- throw "Failed to emit cadl model for $testName."
+ throw "Failed to emit typespec model for $testName."
}
}
diff --git a/eng/UpdateGeneratorMetadata.ps1 b/eng/UpdateGeneratorMetadata.ps1
index 467a327da28..411f2535ab5 100644
--- a/eng/UpdateGeneratorMetadata.ps1
+++ b/eng/UpdateGeneratorMetadata.ps1
@@ -23,6 +23,6 @@ $PackagesProps = "$SdkRepoRoot\eng\Packages.Data.props"
$CadlEmitterProps = "$SdkRepoRoot\eng\emitter-package.json"
(Get-Content -Raw $CadlEmitterProps) -replace `
- '"@azure-tools/cadl-csharp": ".*?"',
-"`"@azure-tools/cadl-csharp`": `"$CadlEmitterVersion`"" | `
+ '"@azure-tools/typespec-csharp": ".*?"',
+"`"@azure-tools/typespec-csharp`": `"$CadlEmitterVersion`"" | `
Set-Content $CadlEmitterProps -NoNewline
diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml
index d75f54bd59f..4776d6c5558 100644
--- a/eng/pipelines/build.yml
+++ b/eng/pipelines/build.yml
@@ -100,7 +100,7 @@ stages:
command: custom
customCommand: run build
workingDir: $(Build.SourcesDirectory)/autorest.csharp/src/CADL.Extension/Emitter.Csharp
- - pwsh: ./eng/ExecuteCadlEmitterUnitTests.ps1
+ - pwsh: ./eng/ExecuteTypespecEmitterUnitTests.ps1
displayName: 'E2E Test for CADL emitter'
workingDirectory: $(Build.SourcesDirectory)/autorest.csharp
- script: |
diff --git a/eng/pipelines/cadl-ci.yml b/eng/pipelines/cadl-ci.yml
index 9975002834e..e985fa5d00f 100644
--- a/eng/pipelines/cadl-ci.yml
+++ b/eng/pipelines/cadl-ci.yml
@@ -76,8 +76,8 @@ stages:
command: custom
customCommand: pack
workingDir: $(Build.SourcesDirectory)/src/CADL.Extension/Emitter.Csharp
- - pwsh: ./eng/ExecuteCadlEmitterUnitTests.ps1
- displayName: 'E2E_Test for CADL emitter'
+ - pwsh: ./eng/ExecuteTypespecEmitterUnitTests.ps1
+ displayName: 'E2E_Test for TypeSpec emitter'
workingDirectory: $(Build.SourcesDirectory)
- script: |
npm run test --prefix src/CADL.Extension/Emitter.Csharp
@@ -85,7 +85,7 @@ stages:
workingDirectory: $(Build.SourcesDirectory)
- script: |
mkdir -p $(VAR_BUILD_ARTIFACT_STAGING_DIRECTORY)/packages
- cp azure-tools-cadl-csharp-*.tgz $(VAR_BUILD_ARTIFACT_STAGING_DIRECTORY)/packages/
+ cp azure-tools-typespec-csharp-*.tgz $(VAR_BUILD_ARTIFACT_STAGING_DIRECTORY)/packages/
displayName: 'Copy CADL Csharp emitter library to staging dir'
workingDirectory: $(Build.SourcesDirectory)/src/CADL.Extension/Emitter.Csharp
- task: PublishBuildArtifacts@1
diff --git a/package-lock.json b/package-lock.json
index fa6af63bead..b322488f501 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,8 +6,8 @@
"": {
"name": "@autorest/csharp",
"devDependencies": {
- "@azure-tools/cadl-csharp": "src/CADL.Extension/Emitter.Csharp",
"@azure-tools/cadl-ranch-mockapis": "file:test/CadlRanchMockApis",
+ "@azure-tools/typespec-csharp": "src/CADL.Extension/Emitter.Csharp",
"@microsoft.azure/autorest.testserver": "3.3.24",
"autorest": "3.6.1"
}
@@ -26,73 +26,25 @@
}
},
"node_modules/@autorest/csharp": {
- "version": "3.0.0-beta.20221201.1",
- "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20221201.1.tgz",
- "integrity": "sha512-dZ7bfHQZ8isqvVUTbDv85loYEzP6DSTbEjZdTocy/TNKP9odVvdFv/VSQqWCwVCmF/2OtvZICZQHSLFzSnOx4Q==",
+ "version": "3.0.0-beta.20230309.1",
+ "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20230309.1.tgz",
+ "integrity": "sha512-PM5P8jctMWREyTgrvtPWvmVn9QvPGs2xWI68NMBmkK0sogsz/LkuzBg0/SuJMse3eQCWKmZEpV3+K7EvWBeJJQ==",
"dev": true
},
- "node_modules/@azure-tools/cadl-autorest": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.26.0.tgz",
- "integrity": "sha512-CoMddqhtZ7lP6O3hbX7Qxq3QeOou64IBmuf4Iz8dcTHOaLfrSoiJshbczEgO/mV62sY5kTmdamWEIi5ZRUpvWA==",
- "dev": true,
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@azure-tools/cadl-azure-core": "~0.26.0",
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/openapi": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0",
- "@cadl-lang/versioning": "~0.40.0"
- }
- },
- "node_modules/@azure-tools/cadl-azure-core": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.26.0.tgz",
- "integrity": "sha512-PYmG/cp+QhyjuQa0jwTkkPp487d500FmPUB5rhjjx+OG080322d+uLeS9tx25dEq3GRoehEnF80qkupBjZBr1g==",
- "dev": true,
- "dependencies": {
- "@cadl-lang/lint": "~0.40.0"
- },
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0"
- }
- },
- "node_modules/@azure-tools/cadl-csharp": {
- "resolved": "src/CADL.Extension/Emitter.Csharp",
- "link": true
- },
- "node_modules/@azure-tools/cadl-dpg": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.26.0.tgz",
- "integrity": "sha512-/F40cUDwKZVPj+dBWxdZ3rXwiqs0kGV6ra/LcNoqK+M+nacd48R4L0512izfJbm8KqFen8yh9jfVC8xQfB6bJg==",
- "dev": true,
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0"
- }
- },
"node_modules/@azure-tools/cadl-ranch": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.3.0.tgz",
- "integrity": "sha512-qo5SjlCW5Bqc/T0WImc9MS82MluC2qHKpErC8qVpjLTSuv9Yc7C+Dyc39VhVo6mLW8xwGelBLcs7mAwP9ISoTQ==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.4.0.tgz",
+ "integrity": "sha512-mCNsoTUHSizyzoiFWUCfSGVzSCUOcaEwNm+XcVeV0Q/bt6r+pUsW+/xB0SUSnpg5PfCWn3Oqt9MqSAtZnNvV9A==",
"dev": true,
"dependencies": {
- "@azure-tools/cadl-ranch-api": "~0.1.12",
- "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.5",
- "@azure-tools/cadl-ranch-expect": "~0.1.16",
+ "@azure-tools/cadl-ranch-api": "~0.2.0",
+ "@azure-tools/cadl-ranch-coverage-sdk": "~0.2.0",
+ "@azure-tools/cadl-ranch-expect": "~0.2.0",
"@azure/identity": "^3.0.0",
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0",
"@types/js-yaml": "^4.0.5",
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0",
"ajv": "8.11.0",
"body-parser": "^1.20.0",
"deep-equal": "^2.0.5",
@@ -117,9 +69,9 @@
}
},
"node_modules/@azure-tools/cadl-ranch-api": {
- "version": "0.1.12",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.12.tgz",
- "integrity": "sha512-HPxejYl+2I8PZa3xsyt89LeQBQaAwazMqMLvU4ga/PnVwzBFaWh93TawEz+OOvOHXHmBxwyuq/8E1uFYzGHSyg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.2.0.tgz",
+ "integrity": "sha512-Vsx2PdgOofSWrV8k01MoNOz4dK8z81Ub/16Y1WttjQbLjSCUQD7c8Ns3Hw5wYWwYW241kCy+xP7BU2Q17JdO/Q==",
"dev": true,
"dependencies": {
"body-parser": "^1.20.0",
@@ -177,9 +129,9 @@
}
},
"node_modules/@azure-tools/cadl-ranch-coverage-sdk": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.5.tgz",
- "integrity": "sha512-T/PYglCTCV7poKeH/i3bpnlHMWyePEFlCoE8I0nWPo730ItmTIlrJqfiE5j6QpeBNDILmLxOey+npEL0Z1epWg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.2.0.tgz",
+ "integrity": "sha512-QBnNVy36vXfSsBW6gDn+eNwhRZK9ZkAPY+ETaXxqjz0jp2pIrjPTykHq6zLipres5Lp4i1ebNAUnHzO/IQim2w==",
"dev": true,
"dependencies": {
"@azure/identity": "^3.0.0",
@@ -191,16 +143,17 @@
}
},
"node_modules/@azure-tools/cadl-ranch-expect": {
- "version": "0.1.16",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.16.tgz",
- "integrity": "sha512-XK5WmDhmp5wqEqWr4CTWY298h3yi2oa91q2AcNenw9Uo895t19anK6f9t1euZl3+Z/1lclRo2naZv3ZgutgmQQ==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.2.0.tgz",
+ "integrity": "sha512-utxoiPMyPxh2ZbpXMFbcQqwm/L/mT3mNGONL9hilMl7GEfOylwW5Sni9pDuF5+7z25ueeuOeGuP7caKbPgefdA==",
"dev": true,
"engines": {
"node": ">=16.0.0"
},
"peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0"
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0"
}
},
"node_modules/@azure-tools/cadl-ranch-mockapis": {
@@ -208,23 +161,24 @@
"link": true
},
"node_modules/@azure-tools/cadl-ranch-specs": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.7.0.tgz",
- "integrity": "sha512-khQukEKv+kyAV0hpinyKUFgCR1vPYqP6hxN7uN9WW5sQynEKvgSuoUnkZgW2G4gxLamVB7gH96U5Sfo8iOM52w==",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.9.0.tgz",
+ "integrity": "sha512-vYNYnP6PE+X2Jr01wZiIq0z+j1MrK83OHrWvKjzd3d5XZDi6O8Jy6saAFStGobPa6cEpXtkZTklEEVI6GQS8TA==",
"dev": true,
"dependencies": {
- "@azure-tools/cadl-ranch": "~0.3.0",
- "@azure-tools/cadl-ranch-api": "~0.1.12"
+ "@azure-tools/cadl-ranch": "~0.4.0",
+ "@azure-tools/cadl-ranch-api": "~0.2.0"
},
"engines": {
"node": ">=16.0.0"
},
"peerDependencies": {
- "@azure-tools/cadl-azure-core": "~0.26.0",
- "@azure-tools/cadl-ranch-expect": "~0.1.16",
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0",
- "@cadl-lang/versioning": "~0.40.0"
+ "@azure-tools/cadl-ranch-expect": "~0.2.0",
+ "@azure-tools/typespec-azure-core": "~0.27.0",
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0",
+ "@typespec/versioning": "~0.41.0"
}
},
"node_modules/@azure-tools/cadl-ranch/node_modules/ajv": {
@@ -271,12 +225,6 @@
"url": "https://github.com/sponsors/isaacs"
}
},
- "node_modules/@azure-tools/cadl-ranch/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
- },
"node_modules/@azure-tools/cadl-ranch/node_modules/minimatch": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -289,6 +237,76 @@
"node": ">=10"
}
},
+ "node_modules/@azure-tools/cadl-ranch/node_modules/node-fetch": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz",
+ "integrity": "sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==",
+ "dev": true,
+ "dependencies": {
+ "data-uri-to-buffer": "^4.0.0",
+ "fetch-blob": "^3.1.4",
+ "formdata-polyfill": "^4.0.10"
+ },
+ "engines": {
+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/node-fetch"
+ }
+ },
+ "node_modules/@azure-tools/typespec-autorest": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.27.0.tgz",
+ "integrity": "sha512-BipJaTL4ouqmZrGQNPw5Nxp5VxrgYtmnZTPzQyN3HKR2b2hFYnj+ViQXhbtbnNbz5A8qny1ya3e3G8nlU4qU/Q==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@azure-tools/typespec-azure-core": "~0.27.0",
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/openapi": "~0.41.0",
+ "@typespec/rest": "~0.41.0",
+ "@typespec/versioning": "~0.41.0"
+ }
+ },
+ "node_modules/@azure-tools/typespec-azure-core": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.27.0.tgz",
+ "integrity": "sha512-jyI7ND2XFy70N/LX4UAY8twKVQZsPkDCmRvum6sVZfZ/xBcGrl8eEDUk1mh9PHRSUGHF4UBnrxLN5CKU79JH6A==",
+ "dev": true,
+ "dependencies": {
+ "@typespec/lint": "~0.41.0"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0"
+ }
+ },
+ "node_modules/@azure-tools/typespec-client-generator-core": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.27.0.tgz",
+ "integrity": "sha512-LfVehVXyETDmKARwKQCxJAMCxF8dFmRWr3mfq4IfK6xvNQwBrHWumFlsYjDgpJCTr6ebgYaamiY1mSpeqTonfw==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0"
+ }
+ },
+ "node_modules/@azure-tools/typespec-csharp": {
+ "resolved": "src/CADL.Extension/Emitter.Csharp",
+ "link": true
+ },
"node_modules/@azure/abort-controller": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz",
@@ -315,9 +333,9 @@
}
},
"node_modules/@azure/core-client": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz",
- "integrity": "sha512-85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz",
+ "integrity": "sha512-ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag==",
"dev": true,
"dependencies": {
"@azure/abort-controller": "^1.0.0",
@@ -333,9 +351,9 @@
}
},
"node_modules/@azure/core-http": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz",
- "integrity": "sha512-cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz",
+ "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==",
"dev": true,
"dependencies": {
"@azure/abort-controller": "^1.0.0",
@@ -348,7 +366,6 @@
"form-data": "^4.0.0",
"node-fetch": "^2.6.7",
"process": "^0.11.10",
- "tough-cookie": "^4.0.0",
"tslib": "^2.2.0",
"tunnel": "^0.0.6",
"uuid": "^8.3.0",
@@ -463,9 +480,9 @@
}
},
"node_modules/@azure/core-rest-pipeline": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz",
- "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==",
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz",
+ "integrity": "sha512-e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q==",
"dev": true,
"dependencies": {
"@azure/abort-controller": "^1.0.0",
@@ -565,16 +582,16 @@
}
},
"node_modules/@azure/core-util": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
- "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz",
+ "integrity": "sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==",
"dev": true,
"dependencies": {
"@azure/abort-controller": "^1.0.0",
"tslib": "^2.2.0"
},
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.0.0"
}
},
"node_modules/@azure/identity": {
@@ -614,33 +631,33 @@
}
},
"node_modules/@azure/logger": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
- "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
+ "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
"dev": true,
"dependencies": {
"tslib": "^2.2.0"
},
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.0.0"
}
},
"node_modules/@azure/msal-browser": {
- "version": "2.33.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz",
- "integrity": "sha512-c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw==",
+ "version": "2.34.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.34.0.tgz",
+ "integrity": "sha512-stoXdlfAtyVIMOp1lS5PorgO5f66MGRi3Q1FBlXhVZFTsTfAWrNdSOx1m/PXWHskWE9aXO+NEzXVOoWmDNnvNA==",
"dev": true,
"dependencies": {
- "@azure/msal-common": "^10.0.0"
+ "@azure/msal-common": "^11.0.0"
},
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/@azure/msal-browser/node_modules/@azure/msal-common": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz",
- "integrity": "sha512-/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-11.0.0.tgz",
+ "integrity": "sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==",
"dev": true,
"engines": {
"node": ">=0.8.0"
@@ -656,12 +673,12 @@
}
},
"node_modules/@azure/msal-node": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz",
- "integrity": "sha512-fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.16.0.tgz",
+ "integrity": "sha512-eGXPp65i++mAIvziafbCH970TCeECB6iaQP7aRzZEjtU238cW4zKm40U8YxkiCn9rR1G2VeMHENB5h6WRk7ZCQ==",
"dev": true,
"dependencies": {
- "@azure/msal-common": "^10.0.0",
+ "@azure/msal-common": "^11.0.0",
"jsonwebtoken": "^9.0.0",
"uuid": "^8.3.0"
},
@@ -670,9 +687,9 @@
}
},
"node_modules/@azure/msal-node/node_modules/@azure/msal-common": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz",
- "integrity": "sha512-/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-11.0.0.tgz",
+ "integrity": "sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==",
"dev": true,
"engines": {
"node": ">=0.8.0"
@@ -688,13 +705,13 @@
}
},
"node_modules/@azure/storage-blob": {
- "version": "12.12.0",
- "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.12.0.tgz",
- "integrity": "sha512-o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g==",
+ "version": "12.13.0",
+ "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.13.0.tgz",
+ "integrity": "sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA==",
"dev": true,
"dependencies": {
"@azure/abort-controller": "^1.0.0",
- "@azure/core-http": "^2.0.0",
+ "@azure/core-http": "^3.0.0",
"@azure/core-lro": "^2.2.0",
"@azure/core-paging": "^1.1.1",
"@azure/core-tracing": "1.0.0-preview.13",
@@ -703,7 +720,7 @@
"tslib": "^2.2.0"
},
"engines": {
- "node": ">=12.0.0"
+ "node": ">=14.0.0"
}
},
"node_modules/@azure/storage-blob/node_modules/@azure/core-tracing": {
@@ -732,30 +749,30 @@
}
},
"node_modules/@babel/compat-data": {
- "version": "7.20.14",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
- "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+ "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/core": {
- "version": "7.20.12",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
- "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+ "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
"dev": true,
"dependencies": {
- "@ampproject/remapping": "^2.1.0",
+ "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.7",
+ "@babel/generator": "^7.21.0",
"@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/helper-module-transforms": "^7.21.0",
+ "@babel/helpers": "^7.21.0",
+ "@babel/parser": "^7.21.0",
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.12",
- "@babel/types": "^7.20.7",
+ "@babel/traverse": "^7.21.0",
+ "@babel/types": "^7.21.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -794,13 +811,14 @@
"dev": true
},
"node_modules/@babel/generator": {
- "version": "7.20.14",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
- "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+ "version": "7.21.1",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+ "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
"dev": true,
"dependencies": {
- "@babel/types": "^7.20.7",
+ "@babel/types": "^7.21.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"engines": {
@@ -850,13 +868,13 @@
}
},
"node_modules/@babel/helper-function-name": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
- "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+ "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
"dev": true,
"dependencies": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.20.7",
+ "@babel/types": "^7.21.0"
},
"engines": {
"node": ">=6.9.0"
@@ -887,9 +905,9 @@
}
},
"node_modules/@babel/helper-module-transforms": {
- "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==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+ "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
"dev": true,
"dependencies": {
"@babel/helper-environment-visitor": "^7.18.9",
@@ -898,8 +916,8 @@
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/helper-validator-identifier": "^7.19.1",
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.10",
- "@babel/types": "^7.20.7"
+ "@babel/traverse": "^7.21.2",
+ "@babel/types": "^7.21.2"
},
"engines": {
"node": ">=6.9.0"
@@ -957,23 +975,23 @@
}
},
"node_modules/@babel/helper-validator-option": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
- "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+ "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
"dev": true,
"engines": {
"node": ">=6.9.0"
}
},
"node_modules/@babel/helpers": {
- "version": "7.20.13",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
- "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+ "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
"dev": true,
"dependencies": {
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.13",
- "@babel/types": "^7.20.7"
+ "@babel/traverse": "^7.21.0",
+ "@babel/types": "^7.21.0"
},
"engines": {
"node": ">=6.9.0"
@@ -1065,9 +1083,9 @@
}
},
"node_modules/@babel/parser": {
- "version": "7.20.15",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
- "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+ "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
"dev": true,
"bin": {
"parser": "bin/babel-parser.js"
@@ -1253,19 +1271,19 @@
}
},
"node_modules/@babel/traverse": {
- "version": "7.20.13",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
- "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+ "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.7",
+ "@babel/generator": "^7.21.1",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
+ "@babel/helper-function-name": "^7.21.0",
"@babel/helper-hoist-variables": "^7.18.6",
"@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.20.13",
- "@babel/types": "^7.20.7",
+ "@babel/parser": "^7.21.2",
+ "@babel/types": "^7.21.2",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -1297,9 +1315,9 @@
"dev": true
},
"node_modules/@babel/types": {
- "version": "7.20.7",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
- "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+ "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
"dev": true,
"dependencies": {
"@babel/helper-string-parser": "^7.19.4",
@@ -1316,169 +1334,6 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
- "node_modules/@cadl-lang/compiler": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.40.0.tgz",
- "integrity": "sha512-4u/Dnm39Ma+8wH0SDu7ya1+2oBRDiNByiRoijwyScHRec26UWLyWvHMvvU89ISU6O8Vwtq0bpmbD7FeJTnlbHw==",
- "dev": true,
- "dependencies": {
- "@babel/code-frame": "~7.18.6",
- "ajv": "~8.11.2",
- "change-case": "~4.1.2",
- "globby": "~13.1.1",
- "js-yaml": "~4.1.0",
- "mkdirp": "~1.0.4",
- "mustache": "~4.2.0",
- "node-fetch": "3.2.8",
- "node-watch": "~0.7.1",
- "picocolors": "~1.0.0",
- "prettier": "~2.8.1",
- "prompts": "~2.4.1",
- "vscode-languageserver": "~8.0.2",
- "vscode-languageserver-textdocument": "~1.0.1",
- "yargs": "~17.6.2"
- },
- "bin": {
- "cadl": "cmd/cadl.js",
- "cadl-server": "cmd/cadl-server.js"
- },
- "engines": {
- "node": ">=16.0.0"
- }
- },
- "node_modules/@cadl-lang/compiler/node_modules/ajv": {
- "version": "8.11.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
- "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
- "dev": true,
- "dependencies": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- },
- "funding": {
- "type": "github",
- "url": "https://github.com/sponsors/epoberezkin"
- }
- },
- "node_modules/@cadl-lang/compiler/node_modules/json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
- },
- "node_modules/@cadl-lang/compiler/node_modules/node-fetch": {
- "version": "3.2.8",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.8.tgz",
- "integrity": "sha512-KtpD1YhGszhntMpBDyp5lyagk8KIMopC1LEb7cQUAh7zcosaX5uK8HnbNb2i3NTQK3sIawCItS0uFC3QzcLHdg==",
- "dev": true,
- "dependencies": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
- },
- "engines": {
- "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/node-fetch"
- }
- },
- "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",
- "integrity": "sha512-H8vM1K/8zyV7lQpT8XPf6VYMz52cil8DUVawdq3JkGrnunLC7woPhzr2Sl9uPg6e9vsiqRi9ZUmB51MIEaO1gA==",
- "dev": true,
- "dependencies": {
- "@rushstack/eslint-patch": "1.1.0 ",
- "@typescript-eslint/eslint-plugin": "^5.30.7",
- "@typescript-eslint/parser": "^5.30.7",
- "eslint": "^8.12.0",
- "eslint-config-prettier": "^8.5.0",
- "eslint-plugin-mocha": "^10.0.5",
- "eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-unicorn": "^42.0.0",
- "typescript": "~4.9.3"
- }
- },
- "node_modules/@cadl-lang/eslint-plugin": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.40.0.tgz",
- "integrity": "sha512-crtHt6tH/1NrhV+9NgpuIk9Un25LIOdZJT2K4H8Eoww5UUQYj3Xp9zhi2nQB0yFk9wQsuI6MjYn97WoD3yUpng==",
- "dev": true,
- "dependencies": {
- "@typescript-eslint/utils": "~5.26.0"
- },
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "eslint": ">=0.8.0"
- }
- },
- "node_modules/@cadl-lang/library-linter": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.40.0.tgz",
- "integrity": "sha512-3VdDcnh32av6ha3BSEGYhS/h6G9JQV70K0N13AcsW0M5aaCjpv9ewbQa4vl7xa31tDlR+pBUDbobwJG5Ij5vHw==",
- "dev": true,
- "engines": {
- "node": ">=14.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0"
- }
- },
- "node_modules/@cadl-lang/lint": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.40.0.tgz",
- "integrity": "sha512-V/V5Msuurhb7kVZsvuAKVAHq4twmC5YC5k/t7YJWETOowFXepgIneWJPH2TDyyzO9WqJjqRJVRXPTrTuKuNFsA==",
- "dev": true,
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0"
- }
- },
- "node_modules/@cadl-lang/openapi": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.40.0.tgz",
- "integrity": "sha512-M2/Pb5AyZd2O5ycYBIoIf4bufip7bCUTMt3gdom1ss6726APbG1fxx98HPcTbXXx0oA+SuqEXtz8k9eaUGLadQ==",
- "dev": true,
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0"
- }
- },
- "node_modules/@cadl-lang/rest": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.40.0.tgz",
- "integrity": "sha512-WfGq6lN87adRKsKd3XtztvOLXHzyFlDRQiEcXKfnwXia37zVwK355KX39P1RimQ9mpDsmXaGG4ETkdUSWvXe7w==",
- "dev": true,
- "engines": {
- "node": ">=16.0.0"
- },
- "peerDependencies": {
- "@cadl-lang/compiler": "~0.40.0"
- }
- },
- "node_modules/@cadl-lang/versioning": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.40.0.tgz",
- "integrity": "sha512-HK/jw0kxo/6RwbnR7nPyCj2kJ94uZbBhEmS08ms+fX4UB4nDNBXqXFwMwgftVZ2qdS9xEkRhLqpVYfEPzlFBJw==",
- "dev": true,
- "dependencies": {
- "@cadl-lang/compiler": "~0.40.0"
- },
- "engines": {
- "node": ">=16.0.0"
- }
- },
"node_modules/@colors/colors": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -1500,9 +1355,9 @@
}
},
"node_modules/@eslint/eslintrc": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
- "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+ "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
"dev": true,
"dependencies": {
"ajv": "^6.12.4",
@@ -1522,6 +1377,22 @@
"url": "https://opencollective.com/eslint"
}
},
+ "node_modules/@eslint/eslintrc/node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
"node_modules/@eslint/eslintrc/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -1554,6 +1425,12 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
"node_modules/@eslint/eslintrc/node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -1572,6 +1449,15 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
+ "node_modules/@eslint/js": {
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+ "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+ "dev": true,
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ }
+ },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.8",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -2192,9 +2078,9 @@
"dev": true
},
"node_modules/@types/node": {
- "version": "18.13.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
- "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==",
+ "version": "18.15.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+ "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
"dev": true
},
"node_modules/@types/node-fetch": {
@@ -2262,14 +2148,14 @@
"dev": true
},
"node_modules/@typescript-eslint/eslint-plugin": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz",
- "integrity": "sha512-lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz",
+ "integrity": "sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/type-utils": "5.52.0",
- "@typescript-eslint/utils": "5.52.0",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/type-utils": "5.54.1",
+ "@typescript-eslint/utils": "5.54.1",
"debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
@@ -2295,32 +2181,6 @@
}
}
},
- "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz",
- "integrity": "sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==",
- "dev": true,
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
- "eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0",
- "semver": "^7.3.7"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
- }
- },
"node_modules/@typescript-eslint/eslint-plugin/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -2378,14 +2238,14 @@
"dev": true
},
"node_modules/@typescript-eslint/parser": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.52.0.tgz",
- "integrity": "sha512-e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz",
+ "integrity": "sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/typescript-estree": "5.54.1",
"debug": "^4.3.4"
},
"engines": {
@@ -2428,13 +2288,13 @@
"dev": true
},
"node_modules/@typescript-eslint/scope-manager": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.52.0.tgz",
- "integrity": "sha512-AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz",
+ "integrity": "sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/visitor-keys": "5.52.0"
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/visitor-keys": "5.54.1"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2445,13 +2305,13 @@
}
},
"node_modules/@typescript-eslint/type-utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.52.0.tgz",
- "integrity": "sha512-tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.1.tgz",
+ "integrity": "sha512-WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g==",
"dev": true,
"dependencies": {
- "@typescript-eslint/typescript-estree": "5.52.0",
- "@typescript-eslint/utils": "5.52.0",
+ "@typescript-eslint/typescript-estree": "5.54.1",
+ "@typescript-eslint/utils": "5.54.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
@@ -2471,32 +2331,6 @@
}
}
},
- "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz",
- "integrity": "sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==",
- "dev": true,
- "dependencies": {
- "@types/json-schema": "^7.0.9",
- "@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
- "eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0",
- "semver": "^7.3.7"
- },
- "engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
- },
- "peerDependencies": {
- "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
- }
- },
"node_modules/@typescript-eslint/type-utils/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -2514,49 +2348,16 @@
}
}
},
- "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",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "node_modules/@typescript-eslint/type-utils/node_modules/semver": {
- "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.js"
- },
- "engines": {
- "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.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.52.0.tgz",
- "integrity": "sha512-oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+ "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==",
"dev": true,
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2567,13 +2368,13 @@
}
},
"node_modules/@typescript-eslint/typescript-estree": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.52.0.tgz",
- "integrity": "sha512-WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+ "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
"dev": true,
"dependencies": {
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/visitor-keys": "5.52.0",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/visitor-keys": "5.54.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -2670,17 +2471,19 @@
"dev": true
},
"node_modules/@typescript-eslint/utils": {
- "version": "5.26.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
- "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.1.tgz",
+ "integrity": "sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==",
"dev": true,
"dependencies": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.26.0",
- "@typescript-eslint/types": "5.26.0",
- "@typescript-eslint/typescript-estree": "5.26.0",
+ "@types/semver": "^7.3.12",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/typescript-estree": "5.54.1",
"eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0"
+ "eslint-utils": "^3.0.0",
+ "semver": "^7.3.7"
},
"engines": {
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2693,7 +2496,146 @@
"eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+ "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/semver": {
+ "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.js"
+ },
+ "engines": {
+ "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.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+ "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/types": "5.54.1",
+ "eslint-visitor-keys": "^3.3.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ }
+ },
+ "node_modules/@typespec/compiler": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.41.0.tgz",
+ "integrity": "sha512-JmSclmneBmWiv2+ROFBhAl69uylIdLVnElB3Xr/hHPza9mcMRz7HR0Zi2tvjATsvPkIUgcoUM/pVXLhNjKeMLw==",
+ "dev": true,
+ "dependencies": {
+ "@babel/code-frame": "~7.18.6",
+ "ajv": "~8.11.2",
+ "change-case": "~4.1.2",
+ "globby": "~13.1.1",
+ "js-yaml": "~4.1.0",
+ "mkdirp": "~1.0.4",
+ "mustache": "~4.2.0",
+ "node-fetch": "3.2.8",
+ "node-watch": "~0.7.1",
+ "picocolors": "~1.0.0",
+ "prettier": "~2.8.1",
+ "prompts": "~2.4.1",
+ "vscode-languageserver": "~8.0.2",
+ "vscode-languageserver-textdocument": "~1.0.1",
+ "yargs": "~17.6.2"
+ },
+ "bin": {
+ "tsp": "cmd/tsp.js",
+ "tsp-server": "cmd/tsp-server.js"
+ },
+ "engines": {
+ "node": ">=16.0.0"
+ }
+ },
+ "node_modules/@typespec/compiler/node_modules/yargs": {
+ "version": "17.6.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+ "dev": true,
+ "dependencies": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@typespec/compiler/node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true,
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/@typespec/eslint-config-typespec": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/@typespec/eslint-config-typespec/-/eslint-config-typespec-0.6.0.tgz",
+ "integrity": "sha512-ZjANoGn+kLr8lDlP5RijeTqKLvVMjq7Vr98dQT8jrz41i+Oal6eCLwHc7JdmssFF9d/czsVaWlBcLH//r3KMLg==",
+ "dev": true,
+ "dependencies": {
+ "@rushstack/eslint-patch": "1.1.0 ",
+ "@typescript-eslint/eslint-plugin": "^5.30.7",
+ "@typescript-eslint/parser": "^5.30.7",
+ "eslint": "^8.12.0",
+ "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-mocha": "^10.0.5",
+ "eslint-plugin-prettier": "^4.0.0",
+ "eslint-plugin-unicorn": "^42.0.0",
+ "typescript": "~4.9.3"
+ }
+ },
+ "node_modules/@typespec/eslint-plugin": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/eslint-plugin/-/eslint-plugin-0.41.0.tgz",
+ "integrity": "sha512-0yTYUKvZNfpqqtisF5whEwfXDPKkwKZifB8D1yJnG1xnjdlg06X/tqIxugyMfwWigmog0ymtr6/7vFdXUTcjdg==",
+ "dev": true,
+ "dependencies": {
+ "@typescript-eslint/utils": "~5.26.0"
+ },
+ "engines": {
+ "node": ">=14.0.0"
+ },
+ "peerDependencies": {
+ "eslint": ">=0.8.0"
+ }
+ },
+ "node_modules/@typespec/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
"version": "5.26.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz",
"integrity": "sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==",
@@ -2710,7 +2652,7 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+ "node_modules/@typespec/eslint-plugin/node_modules/@typescript-eslint/types": {
"version": "5.26.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz",
"integrity": "sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==",
@@ -2723,7 +2665,7 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+ "node_modules/@typespec/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
"version": "5.26.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz",
"integrity": "sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==",
@@ -2750,7 +2692,31 @@
}
}
},
- "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+ "node_modules/@typespec/eslint-plugin/node_modules/@typescript-eslint/utils": {
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
+ "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
+ "dev": true,
+ "dependencies": {
+ "@types/json-schema": "^7.0.9",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
+ "eslint-scope": "^5.1.1",
+ "eslint-utils": "^3.0.0"
+ },
+ "engines": {
+ "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/typescript-eslint"
+ },
+ "peerDependencies": {
+ "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+ }
+ },
+ "node_modules/@typespec/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
"version": "5.26.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz",
"integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==",
@@ -2767,7 +2733,7 @@
"url": "https://opencollective.com/typescript-eslint"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/debug": {
+ "node_modules/@typespec/eslint-plugin/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
@@ -2784,7 +2750,7 @@
}
}
},
- "node_modules/@typescript-eslint/utils/node_modules/globby": {
+ "node_modules/@typespec/eslint-plugin/node_modules/globby": {
"version": "11.1.0",
"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
@@ -2804,7 +2770,7 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
+ "node_modules/@typespec/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==",
@@ -2816,13 +2782,13 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/ms": {
+ "node_modules/@typespec/eslint-plugin/node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "node_modules/@typescript-eslint/utils/node_modules/semver": {
+ "node_modules/@typespec/eslint-plugin/node_modules/semver": {
"version": "7.3.8",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
"integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
@@ -2837,27 +2803,84 @@
"node": ">=10"
}
},
- "node_modules/@typescript-eslint/utils/node_modules/yallist": {
+ "node_modules/@typespec/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/visitor-keys": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.52.0.tgz",
- "integrity": "sha512-qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA==",
+ "node_modules/@typespec/http": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.41.0.tgz",
+ "integrity": "sha512-lKewobsQVlpEUWCH/jw3eodugCqR9VqSP3a7iM9IrhULjhNExLQ7GHR6GpKyxBLSMq8mqThrC0u0hLJNd0iRuQ==",
"dev": true,
- "dependencies": {
- "@typescript-eslint/types": "5.52.0",
- "eslint-visitor-keys": "^3.3.0"
+ "engines": {
+ "node": ">=16.0.0"
},
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0"
+ }
+ },
+ "node_modules/@typespec/library-linter": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.41.0.tgz",
+ "integrity": "sha512-0ShRGpB+CzUP9y54EEkOBTEddTT3PHBBVFX9y97qZHTf1JdBifD4ykdvCX+zrR/dN3EZWrpTG3+k/wXf77uKDg==",
+ "dev": true,
"engines": {
- "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+ "node": ">=14.0.0"
},
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/typescript-eslint"
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0"
+ }
+ },
+ "node_modules/@typespec/lint": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.41.0.tgz",
+ "integrity": "sha512-Xv54f+Nj+WWf+fq6AQk36QHO/bMKMltNwOwYXqV/51yzgc3VBk7wlHeGq+J9A7pW8WsV7T1nkdRCg2d7GaXPcw==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0"
+ }
+ },
+ "node_modules/@typespec/openapi": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.41.0.tgz",
+ "integrity": "sha512-0zfmsorziqlaPHxM6ZckmLUlu7L4qY/BKO//uHA49UjSVWzMfq8O4szFYtQpaBjDMhsOV5AQRAF/elz6gMcqsg==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0"
+ }
+ },
+ "node_modules/@typespec/rest": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.41.0.tgz",
+ "integrity": "sha512-C3pAvXDzwe42H+4pdHXV5NiCFFZX8+igTLQR5aKZUixng9sN+Uz0PTv3QWGgHSBZvP+webTCswGDfHDLJotNxA==",
+ "dev": true,
+ "engines": {
+ "node": ">=16.0.0"
+ },
+ "peerDependencies": {
+ "@typespec/compiler": "~0.41.0"
+ }
+ },
+ "node_modules/@typespec/versioning": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.41.0.tgz",
+ "integrity": "sha512-B1zHxzPVZ1ZUHE7ZDPhjjhe0tx6mk0UfPNV2sALrk5VVPFeXQSK4DJcB6vvvSpBoPOqtb81/wKENsYAM7Vfmog==",
+ "dev": true,
+ "dependencies": {
+ "@typespec/compiler": "~0.41.0"
+ },
+ "engines": {
+ "node": ">=16.0.0"
}
},
"node_modules/@ungap/promise-all-settled": {
@@ -2973,14 +2996,14 @@
"dev": true
},
"node_modules/ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "version": "8.11.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+ "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
"dev": true,
"dependencies": {
"fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
+ "json-schema-traverse": "^1.0.0",
+ "require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
},
"funding": {
@@ -3323,13 +3346,13 @@
}
},
"node_modules/body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+ "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
- "content-type": "~1.0.4",
+ "content-type": "~1.0.5",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
@@ -3337,7 +3360,7 @@
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
"qs": "6.11.0",
- "raw-body": "2.5.1",
+ "raw-body": "2.5.2",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
},
@@ -3652,9 +3675,9 @@
}
},
"node_modules/caniuse-lite": {
- "version": "1.0.30001452",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001452.tgz",
- "integrity": "sha512-Lkp0vFjMkBB3GTpLR8zk4NwW5EdRdnitwYJHDOOKIU85x4ckYCPQ+9WlVvSVClHxVReefkUMtWZH2l9KGlD51w==",
+ "version": "1.0.30001464",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz",
+ "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==",
"dev": true,
"funding": [
{
@@ -4320,9 +4343,9 @@
"dev": true
},
"node_modules/electron-to-chromium": {
- "version": "1.4.296",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.296.tgz",
- "integrity": "sha512-i/6Q+Y9bluDa2a0NbMvdtG5TuS/1Fr3TKK8L+7UUL9QjRS5iFJzCC3r70xjyOnLiYG8qGV4/mMpe6HuAbdJW4w==",
+ "version": "1.4.327",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.327.tgz",
+ "integrity": "sha512-DIk2H4g/3ZhjgiABJjVdQvUdMlSABOsjeCm6gmUzIdKxAuFrGiJ8QXMm3i09grZdDBMC/d8MELMrdwYRC0+YHg==",
"dev": true
},
"node_modules/emittery": {
@@ -4409,12 +4432,15 @@
"dev": true
},
"node_modules/escape-string-regexp": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
- "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
"dev": true,
"engines": {
- "node": ">=8"
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/escodegen": {
@@ -4439,13 +4465,74 @@
"source-map": "~0.6.1"
}
},
+ "node_modules/escodegen/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
+ "node_modules/escodegen/node_modules/levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+ "dev": true,
+ "dependencies": {
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/escodegen/node_modules/optionator": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "dev": true,
+ "dependencies": {
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.6",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "word-wrap": "~1.2.3"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/escodegen/node_modules/prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+ "dev": true,
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
+ "node_modules/escodegen/node_modules/type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+ "dev": true,
+ "dependencies": {
+ "prelude-ls": "~1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.8.0"
+ }
+ },
"node_modules/eslint": {
- "version": "8.34.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
- "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+ "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
"dev": true,
"dependencies": {
- "@eslint/eslintrc": "^1.4.1",
+ "@eslint/eslintrc": "^2.0.0",
+ "@eslint/js": "8.35.0",
"@humanwhocodes/config-array": "^0.11.8",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
@@ -4459,7 +4546,7 @@
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
"espree": "^9.4.0",
- "esquery": "^1.4.0",
+ "esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
@@ -4496,9 +4583,9 @@
}
},
"node_modules/eslint-config-prettier": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
- "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
+ "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
"dev": true,
"bin": {
"eslint-config-prettier": "bin/cli.js"
@@ -4621,15 +4708,6 @@
"node": ">=8.0.0"
}
},
- "node_modules/eslint-scope/node_modules/estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "dev": true,
- "engines": {
- "node": ">=4.0"
- }
- },
"node_modules/eslint-utils": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
@@ -4666,6 +4744,22 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
+ "node_modules/eslint/node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
"node_modules/eslint/node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -4683,18 +4777,6 @@
}
}
},
- "node_modules/eslint/node_modules/escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/eslint/node_modules/eslint-scope": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
@@ -4708,6 +4790,15 @@
"node": "^12.22.0 || ^14.17.0 || >=16.0.0"
}
},
+ "node_modules/eslint/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/eslint/node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -4739,18 +4830,11 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/eslint/node_modules/levn": {
+ "node_modules/eslint/node_modules/json-schema-traverse": {
"version": "0.4.1",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
- "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "dev": true,
- "dependencies": {
- "prelude-ls": "^1.2.1",
- "type-check": "~0.4.0"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
},
"node_modules/eslint/node_modules/locate-path": {
"version": "6.0.0",
@@ -4773,23 +4857,6 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "node_modules/eslint/node_modules/optionator": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
- "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
- "dev": true,
- "dependencies": {
- "deep-is": "^0.1.3",
- "fast-levenshtein": "^2.0.6",
- "levn": "^0.4.1",
- "prelude-ls": "^1.2.1",
- "type-check": "^0.4.0",
- "word-wrap": "^1.2.3"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
"node_modules/eslint/node_modules/p-limit": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -4820,27 +4887,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
- "node_modules/eslint/node_modules/prelude-ls": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
- "dev": true,
- "engines": {
- "node": ">= 0.8.0"
- }
- },
- "node_modules/eslint/node_modules/type-check": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
- "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "dev": true,
- "dependencies": {
- "prelude-ls": "^1.2.1"
- },
- "engines": {
- "node": ">= 0.8.0"
- }
- },
"node_modules/eslint/node_modules/type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -4884,9 +4930,9 @@
}
},
"node_modules/esquery": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
- "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
"dev": true,
"dependencies": {
"estraverse": "^5.1.0"
@@ -4895,6 +4941,15 @@
"node": ">=0.10"
}
},
+ "node_modules/esquery/node_modules/estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/esrecurse": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -4907,7 +4962,7 @@
"node": ">=4.0"
}
},
- "node_modules/estraverse": {
+ "node_modules/esrecurse/node_modules/estraverse": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
@@ -4916,6 +4971,15 @@
"node": ">=4.0"
}
},
+ "node_modules/estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "dev": true,
+ "engines": {
+ "node": ">=4.0"
+ }
+ },
"node_modules/esutils": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
@@ -5025,34 +5089,73 @@
"setprototypeof": "1.2.0",
"statuses": "2.0.1",
"type-is": "~1.6.18",
- "utils-merge": "1.0.1",
- "vary": "~1.1.2"
+ "utils-merge": "1.0.1",
+ "vary": "~1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.10.0"
+ }
+ },
+ "node_modules/express-promise-router": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/express-promise-router/-/express-promise-router-4.1.1.tgz",
+ "integrity": "sha512-Lkvcy/ZGrBhzkl3y7uYBHLMtLI4D6XQ2kiFg9dq7fbktBch5gjqJ0+KovX0cvCAvTJw92raWunRLM/OM+5l4fA==",
+ "dev": true,
+ "dependencies": {
+ "is-promise": "^4.0.0",
+ "lodash.flattendeep": "^4.0.0",
+ "methods": "^1.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "@types/express": "^4.0.0",
+ "express": "^4.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/express": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/express/node_modules/body-parser": {
+ "version": "1.20.1",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+ "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "dev": true,
+ "dependencies": {
+ "bytes": "3.1.2",
+ "content-type": "~1.0.4",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
},
"engines": {
- "node": ">= 0.10.0"
+ "node": ">= 0.8",
+ "npm": "1.2.8000 || >= 1.4.16"
}
},
- "node_modules/express-promise-router": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/express-promise-router/-/express-promise-router-4.1.1.tgz",
- "integrity": "sha512-Lkvcy/ZGrBhzkl3y7uYBHLMtLI4D6XQ2kiFg9dq7fbktBch5gjqJ0+KovX0cvCAvTJw92raWunRLM/OM+5l4fA==",
+ "node_modules/express/node_modules/raw-body": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+ "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
"dev": true,
"dependencies": {
- "is-promise": "^4.0.0",
- "lodash.flattendeep": "^4.0.0",
- "methods": "^1.0.0"
+ "bytes": "3.1.2",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
},
"engines": {
- "node": ">=10"
- },
- "peerDependencies": {
- "@types/express": "^4.0.0",
- "express": "^4.0.0"
- },
- "peerDependenciesMeta": {
- "@types/express": {
- "optional": true
- }
+ "node": ">= 0.8"
}
},
"node_modules/extend": {
@@ -5367,15 +5470,6 @@
"node": ">=12"
}
},
- "node_modules/fs-extra/node_modules/universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true,
- "engines": {
- "node": ">= 10.0.0"
- }
- },
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -5601,6 +5695,28 @@
"node": ">=6"
}
},
+ "node_modules/har-validator/node_modules/ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "dependencies": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/epoberezkin"
+ }
+ },
+ "node_modules/har-validator/node_modules/json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
"node_modules/has": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
@@ -5685,9 +5801,9 @@
}
},
"node_modules/hash-base/node_modules/readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
@@ -5993,13 +6109,13 @@
}
},
"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==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+ "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
+ "get-intrinsic": "^1.2.0",
"is-typed-array": "^1.1.10"
},
"funding": {
@@ -7269,9 +7385,9 @@
"dev": true
},
"node_modules/json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
"node_modules/json-serialize-refs": {
@@ -7316,15 +7432,6 @@
"graceful-fs": "^4.1.6"
}
},
- "node_modules/jsonfile/node_modules/universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true,
- "engines": {
- "node": ">= 10.0.0"
- }
- },
"node_modules/jsonparse": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz",
@@ -7471,13 +7578,13 @@
}
},
"node_modules/levn": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
- "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
"dev": true,
"dependencies": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
+ "prelude-ls": "^1.2.1",
+ "type-check": "~0.4.0"
},
"engines": {
"node": ">= 0.8.0"
@@ -7845,18 +7952,6 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "node_modules/mocha/node_modules/escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true,
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
"node_modules/mocha/node_modules/find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -8116,9 +8211,9 @@
}
},
"node_modules/node-fetch": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz",
- "integrity": "sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==",
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.8.tgz",
+ "integrity": "sha512-KtpD1YhGszhntMpBDyp5lyagk8KIMopC1LEb7cQUAh7zcosaX5uK8HnbNb2i3NTQK3sIawCItS0uFC3QzcLHdg==",
"dev": true,
"dependencies": {
"data-uri-to-buffer": "^4.0.0",
@@ -8318,9 +8413,9 @@
}
},
"node_modules/open": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz",
- "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==",
+ "version": "8.4.2",
+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+ "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
"dev": true,
"dependencies": {
"define-lazy-prop": "^2.0.0",
@@ -8335,17 +8430,17 @@
}
},
"node_modules/optionator": {
- "version": "0.8.3",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
- "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
"dev": true,
"dependencies": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.6",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "word-wrap": "~1.2.3"
+ "deep-is": "^0.1.3",
+ "fast-levenshtein": "^2.0.6",
+ "levn": "^0.4.1",
+ "prelude-ls": "^1.2.1",
+ "type-check": "^0.4.0",
+ "word-wrap": "^1.2.3"
},
"engines": {
"node": ">= 0.8.0"
@@ -8565,9 +8660,9 @@
}
},
"node_modules/prelude-ls": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
- "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
"dev": true,
"engines": {
"node": ">= 0.8.0"
@@ -8724,9 +8819,9 @@
]
},
"node_modules/rambda": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.4.0.tgz",
- "integrity": "sha512-A9hihu7dUTLOUCM+I8E61V4kRXnN4DwYeK0DwCBydC1MqNI1PidyAtbtpsJlBBzK4icSctEcCQ1bGcLpBuETUQ==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz",
+ "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==",
"dev": true
},
"node_modules/randombytes": {
@@ -8748,9 +8843,9 @@
}
},
"node_modules/raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"dev": true,
"dependencies": {
"bytes": "3.1.2",
@@ -8819,9 +8914,9 @@
}
},
"node_modules/readable-stream": {
- "version": "2.3.7",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"dependencies": {
"core-util-is": "~1.0.0",
@@ -9371,9 +9466,9 @@
}
},
"node_modules/spdx-correct": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
- "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
"dev": true,
"dependencies": {
"spdx-expression-parse": "^3.0.0",
@@ -9454,6 +9549,15 @@
"node": ">=10"
}
},
+ "node_modules/stack-utils/node_modules/escape-string-regexp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "dev": true,
+ "engines": {
+ "node": ">=8"
+ }
+ },
"node_modules/statuses": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -9747,6 +9851,15 @@
"node": ">=6"
}
},
+ "node_modules/tough-cookie/node_modules/universalify": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "dev": true,
+ "engines": {
+ "node": ">= 4.0.0"
+ }
+ },
"node_modules/tr46": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
@@ -9896,12 +10009,12 @@
"dev": true
},
"node_modules/type-check": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
- "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
"dev": true,
"dependencies": {
- "prelude-ls": "~1.1.2"
+ "prelude-ls": "^1.2.1"
},
"engines": {
"node": ">= 0.8.0"
@@ -9970,12 +10083,12 @@
"dev": true
},
"node_modules/universalify": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
- "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
"dev": true,
"engines": {
- "node": ">= 4.0.0"
+ "node": ">= 10.0.0"
}
},
"node_modules/unpipe": {
@@ -10370,9 +10483,9 @@
}
},
"node_modules/winston-transport/node_modules/readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
@@ -10384,9 +10497,9 @@
}
},
"node_modules/winston/node_modules/readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"dependencies": {
"inherits": "^2.0.3",
@@ -10527,9 +10640,9 @@
"dev": true
},
"node_modules/yargs": {
- "version": "17.6.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
- "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+ "version": "17.7.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+ "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
"dev": true,
"dependencies": {
"cliui": "^8.0.1",
@@ -10602,22 +10715,23 @@
}
},
"src/CADL.Extension/Emitter.Csharp": {
- "name": "@azure-tools/cadl-csharp",
- "version": "0.1.11",
+ "name": "@azure-tools/typespec-csharp",
+ "version": "0.2.0",
"dev": true,
"license": "MIT",
"dependencies": {
- "@autorest/csharp": "3.0.0-beta.20221201.1",
- "@azure-tools/cadl-autorest": "0.26.0",
- "@azure-tools/cadl-azure-core": "0.26.0",
- "@azure-tools/cadl-dpg": "0.26.0",
- "@cadl-lang/compiler": "0.40.0",
- "@cadl-lang/eslint-config-cadl": "0.5.0",
- "@cadl-lang/eslint-plugin": "0.40.0",
- "@cadl-lang/library-linter": "0.40.0",
- "@cadl-lang/openapi": "0.40.0",
- "@cadl-lang/rest": "0.40.0",
- "@cadl-lang/versioning": "0.40.0",
+ "@autorest/csharp": "3.0.0-beta.20230309.1",
+ "@azure-tools/typespec-autorest": "0.27.0",
+ "@azure-tools/typespec-azure-core": "0.27.0",
+ "@azure-tools/typespec-client-generator-core": "0.27.0",
+ "@typespec/compiler": "0.41.0",
+ "@typespec/eslint-config-typespec": "0.6.0",
+ "@typespec/eslint-plugin": "0.41.0",
+ "@typespec/http": "0.41.0",
+ "@typespec/library-linter": "0.41.0",
+ "@typespec/openapi": "0.41.0",
+ "@typespec/rest": "0.41.0",
+ "@typespec/versioning": "0.41.0",
"fs-extra": "^10.1.0",
"js-yaml": "^4.1.0",
"json-serialize-refs": "^0.1.0-0",
@@ -10638,13 +10752,19 @@
"typescript": "~4.9.4"
}
},
+ "src/CADL.Extension/Emitter.Csharp/node_modules/@types/node": {
+ "version": "18.13.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
+ "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==",
+ "dev": true
+ },
"test/CadlRanchMockApis": {
"name": "@azure-tools/cadl-ranch-mockapis",
"version": "0.0.1",
"dev": true,
"license": "MIT",
"dependencies": {
- "@azure-tools/cadl-ranch-specs": "0.7.0"
+ "@azure-tools/cadl-ranch-specs": "0.9.0"
}
}
},
@@ -10660,79 +10780,25 @@
}
},
"@autorest/csharp": {
- "version": "3.0.0-beta.20221201.1",
- "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20221201.1.tgz",
- "integrity": "sha512-dZ7bfHQZ8isqvVUTbDv85loYEzP6DSTbEjZdTocy/TNKP9odVvdFv/VSQqWCwVCmF/2OtvZICZQHSLFzSnOx4Q==",
+ "version": "3.0.0-beta.20230309.1",
+ "resolved": "https://registry.npmjs.org/@autorest/csharp/-/csharp-3.0.0-beta.20230309.1.tgz",
+ "integrity": "sha512-PM5P8jctMWREyTgrvtPWvmVn9QvPGs2xWI68NMBmkK0sogsz/LkuzBg0/SuJMse3eQCWKmZEpV3+K7EvWBeJJQ==",
"dev": true
},
- "@azure-tools/cadl-autorest": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-autorest/-/cadl-autorest-0.26.0.tgz",
- "integrity": "sha512-CoMddqhtZ7lP6O3hbX7Qxq3QeOou64IBmuf4Iz8dcTHOaLfrSoiJshbczEgO/mV62sY5kTmdamWEIi5ZRUpvWA==",
- "dev": true,
- "requires": {}
- },
- "@azure-tools/cadl-azure-core": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-azure-core/-/cadl-azure-core-0.26.0.tgz",
- "integrity": "sha512-PYmG/cp+QhyjuQa0jwTkkPp487d500FmPUB5rhjjx+OG080322d+uLeS9tx25dEq3GRoehEnF80qkupBjZBr1g==",
- "dev": true,
- "requires": {
- "@cadl-lang/lint": "~0.40.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.26.0",
- "@azure-tools/cadl-azure-core": "0.26.0",
- "@azure-tools/cadl-dpg": "0.26.0",
- "@cadl-lang/compiler": "0.40.0",
- "@cadl-lang/eslint-config-cadl": "0.5.0",
- "@cadl-lang/eslint-plugin": "0.40.0",
- "@cadl-lang/library-linter": "0.40.0",
- "@cadl-lang/openapi": "0.40.0",
- "@cadl-lang/rest": "0.40.0",
- "@cadl-lang/versioning": "0.40.0",
- "@types/fs-extra": "^9.0.13",
- "@types/js-yaml": "^4.0.5",
- "@types/lodash.isequal": "^4.5.6",
- "@types/mocha": "~9.1.0",
- "@types/node": "~18.13.0",
- "@types/prettier": "^2.6.3",
- "c8": "~7.11.0",
- "eslint": "^8.12.0",
- "fs-extra": "^10.1.0",
- "js-yaml": "^4.1.0",
- "json-serialize-refs": "^0.1.0-0",
- "lodash.isequal": "^4.5.0",
- "mocha": "~9.2.0",
- "rimraf": "~3.0.2",
- "typescript": "~4.9.4",
- "winston": "^3.8.2"
- }
- },
- "@azure-tools/cadl-dpg": {
- "version": "0.26.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-dpg/-/cadl-dpg-0.26.0.tgz",
- "integrity": "sha512-/F40cUDwKZVPj+dBWxdZ3rXwiqs0kGV6ra/LcNoqK+M+nacd48R4L0512izfJbm8KqFen8yh9jfVC8xQfB6bJg==",
- "dev": true,
- "requires": {}
- },
"@azure-tools/cadl-ranch": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.3.0.tgz",
- "integrity": "sha512-qo5SjlCW5Bqc/T0WImc9MS82MluC2qHKpErC8qVpjLTSuv9Yc7C+Dyc39VhVo6mLW8xwGelBLcs7mAwP9ISoTQ==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch/-/cadl-ranch-0.4.0.tgz",
+ "integrity": "sha512-mCNsoTUHSizyzoiFWUCfSGVzSCUOcaEwNm+XcVeV0Q/bt6r+pUsW+/xB0SUSnpg5PfCWn3Oqt9MqSAtZnNvV9A==",
"dev": true,
"requires": {
- "@azure-tools/cadl-ranch-api": "~0.1.12",
- "@azure-tools/cadl-ranch-coverage-sdk": "~0.1.5",
- "@azure-tools/cadl-ranch-expect": "~0.1.16",
+ "@azure-tools/cadl-ranch-api": "~0.2.0",
+ "@azure-tools/cadl-ranch-coverage-sdk": "~0.2.0",
+ "@azure-tools/cadl-ranch-expect": "~0.2.0",
"@azure/identity": "^3.0.0",
- "@cadl-lang/compiler": "~0.40.0",
- "@cadl-lang/rest": "~0.40.0",
"@types/js-yaml": "^4.0.5",
+ "@typespec/compiler": "~0.41.0",
+ "@typespec/http": "~0.41.0",
+ "@typespec/rest": "~0.41.0",
"ajv": "8.11.0",
"body-parser": "^1.20.0",
"deep-equal": "^2.0.5",
@@ -10784,12 +10850,6 @@
"once": "^1.3.0"
}
},
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
- },
"minimatch": {
"version": "5.1.6",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
@@ -10798,13 +10858,24 @@
"requires": {
"brace-expansion": "^2.0.1"
}
+ },
+ "node-fetch": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz",
+ "integrity": "sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==",
+ "dev": true,
+ "requires": {
+ "data-uri-to-buffer": "^4.0.0",
+ "fetch-blob": "^3.1.4",
+ "formdata-polyfill": "^4.0.10"
+ }
}
}
},
"@azure-tools/cadl-ranch-api": {
- "version": "0.1.12",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.1.12.tgz",
- "integrity": "sha512-HPxejYl+2I8PZa3xsyt89LeQBQaAwazMqMLvU4ga/PnVwzBFaWh93TawEz+OOvOHXHmBxwyuq/8E1uFYzGHSyg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-api/-/cadl-ranch-api-0.2.0.tgz",
+ "integrity": "sha512-Vsx2PdgOofSWrV8k01MoNOz4dK8z81Ub/16Y1WttjQbLjSCUQD7c8Ns3Hw5wYWwYW241kCy+xP7BU2Q17JdO/Q==",
"dev": true,
"requires": {
"body-parser": "^1.20.0",
@@ -10852,9 +10923,9 @@
}
},
"@azure-tools/cadl-ranch-coverage-sdk": {
- "version": "0.1.5",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.1.5.tgz",
- "integrity": "sha512-T/PYglCTCV7poKeH/i3bpnlHMWyePEFlCoE8I0nWPo730ItmTIlrJqfiE5j6QpeBNDILmLxOey+npEL0Z1epWg==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-coverage-sdk/-/cadl-ranch-coverage-sdk-0.2.0.tgz",
+ "integrity": "sha512-QBnNVy36vXfSsBW6gDn+eNwhRZK9ZkAPY+ETaXxqjz0jp2pIrjPTykHq6zLipres5Lp4i1ebNAUnHzO/IQim2w==",
"dev": true,
"requires": {
"@azure/identity": "^3.0.0",
@@ -10863,26 +10934,90 @@
}
},
"@azure-tools/cadl-ranch-expect": {
- "version": "0.1.16",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.1.16.tgz",
- "integrity": "sha512-XK5WmDhmp5wqEqWr4CTWY298h3yi2oa91q2AcNenw9Uo895t19anK6f9t1euZl3+Z/1lclRo2naZv3ZgutgmQQ==",
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-expect/-/cadl-ranch-expect-0.2.0.tgz",
+ "integrity": "sha512-utxoiPMyPxh2ZbpXMFbcQqwm/L/mT3mNGONL9hilMl7GEfOylwW5Sni9pDuF5+7z25ueeuOeGuP7caKbPgefdA==",
"dev": true,
"requires": {}
},
"@azure-tools/cadl-ranch-mockapis": {
"version": "file:test/CadlRanchMockApis",
"requires": {
- "@azure-tools/cadl-ranch-specs": "0.7.0"
+ "@azure-tools/cadl-ranch-specs": "0.9.0"
}
},
"@azure-tools/cadl-ranch-specs": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.7.0.tgz",
- "integrity": "sha512-khQukEKv+kyAV0hpinyKUFgCR1vPYqP6hxN7uN9WW5sQynEKvgSuoUnkZgW2G4gxLamVB7gH96U5Sfo8iOM52w==",
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/cadl-ranch-specs/-/cadl-ranch-specs-0.9.0.tgz",
+ "integrity": "sha512-vYNYnP6PE+X2Jr01wZiIq0z+j1MrK83OHrWvKjzd3d5XZDi6O8Jy6saAFStGobPa6cEpXtkZTklEEVI6GQS8TA==",
+ "dev": true,
+ "requires": {
+ "@azure-tools/cadl-ranch": "~0.4.0",
+ "@azure-tools/cadl-ranch-api": "~0.2.0"
+ }
+ },
+ "@azure-tools/typespec-autorest": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-autorest/-/typespec-autorest-0.27.0.tgz",
+ "integrity": "sha512-BipJaTL4ouqmZrGQNPw5Nxp5VxrgYtmnZTPzQyN3HKR2b2hFYnj+ViQXhbtbnNbz5A8qny1ya3e3G8nlU4qU/Q==",
+ "dev": true,
+ "requires": {}
+ },
+ "@azure-tools/typespec-azure-core": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-azure-core/-/typespec-azure-core-0.27.0.tgz",
+ "integrity": "sha512-jyI7ND2XFy70N/LX4UAY8twKVQZsPkDCmRvum6sVZfZ/xBcGrl8eEDUk1mh9PHRSUGHF4UBnrxLN5CKU79JH6A==",
+ "dev": true,
+ "requires": {
+ "@typespec/lint": "~0.41.0"
+ }
+ },
+ "@azure-tools/typespec-client-generator-core": {
+ "version": "0.27.0",
+ "resolved": "https://registry.npmjs.org/@azure-tools/typespec-client-generator-core/-/typespec-client-generator-core-0.27.0.tgz",
+ "integrity": "sha512-LfVehVXyETDmKARwKQCxJAMCxF8dFmRWr3mfq4IfK6xvNQwBrHWumFlsYjDgpJCTr6ebgYaamiY1mSpeqTonfw==",
"dev": true,
+ "requires": {}
+ },
+ "@azure-tools/typespec-csharp": {
+ "version": "file:src/CADL.Extension/Emitter.Csharp",
"requires": {
- "@azure-tools/cadl-ranch": "~0.3.0",
- "@azure-tools/cadl-ranch-api": "~0.1.12"
+ "@autorest/csharp": "3.0.0-beta.20230309.1",
+ "@azure-tools/typespec-autorest": "0.27.0",
+ "@azure-tools/typespec-azure-core": "0.27.0",
+ "@azure-tools/typespec-client-generator-core": "0.27.0",
+ "@types/fs-extra": "^9.0.13",
+ "@types/js-yaml": "^4.0.5",
+ "@types/lodash.isequal": "^4.5.6",
+ "@types/mocha": "~9.1.0",
+ "@types/node": "~18.13.0",
+ "@types/prettier": "^2.6.3",
+ "@typespec/compiler": "0.41.0",
+ "@typespec/eslint-config-typespec": "0.6.0",
+ "@typespec/eslint-plugin": "0.41.0",
+ "@typespec/http": "0.41.0",
+ "@typespec/library-linter": "0.41.0",
+ "@typespec/openapi": "0.41.0",
+ "@typespec/rest": "0.41.0",
+ "@typespec/versioning": "0.41.0",
+ "c8": "~7.11.0",
+ "eslint": "^8.12.0",
+ "fs-extra": "^10.1.0",
+ "js-yaml": "^4.1.0",
+ "json-serialize-refs": "^0.1.0-0",
+ "lodash.isequal": "^4.5.0",
+ "mocha": "~9.2.0",
+ "rimraf": "~3.0.2",
+ "typescript": "~4.9.4",
+ "winston": "^3.8.2"
+ },
+ "dependencies": {
+ "@types/node": {
+ "version": "18.13.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
+ "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==",
+ "dev": true
+ }
}
},
"@azure/abort-controller": {
@@ -10905,9 +11040,9 @@
}
},
"@azure/core-client": {
- "version": "1.7.1",
- "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.1.tgz",
- "integrity": "sha512-85igXpc5V7ns6rvMEpLmIcBDftjUgTWD+0tmYPyQEfPfkAwpPTs1X5rhCDsfqvUZGA8Ksid1hdZGu62r6XXeHg==",
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/@azure/core-client/-/core-client-1.7.2.tgz",
+ "integrity": "sha512-ye5554gnVnXdfZ64hptUtETgacXoRWxYv1JF5MctoAzTSH5dXhDPZd9gOjDPyWMcLIk58pnP5+p5vGX6PYn1ag==",
"dev": true,
"requires": {
"@azure/abort-controller": "^1.0.0",
@@ -10920,9 +11055,9 @@
}
},
"@azure/core-http": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-2.3.1.tgz",
- "integrity": "sha512-cur03BUwV0Tbv81bQBOLafFB02B6G++K6F2O3IMl8pSE2QlXm3cu11bfyBNlDUKi5U+xnB3GC63ae3athhkx6Q==",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz",
+ "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==",
"dev": true,
"requires": {
"@azure/abort-controller": "^1.0.0",
@@ -10935,7 +11070,6 @@
"form-data": "^4.0.0",
"node-fetch": "^2.6.7",
"process": "^0.11.10",
- "tough-cookie": "^4.0.0",
"tslib": "^2.2.0",
"tunnel": "^0.0.6",
"uuid": "^8.3.0",
@@ -11023,9 +11157,9 @@
}
},
"@azure/core-rest-pipeline": {
- "version": "1.10.1",
- "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.1.tgz",
- "integrity": "sha512-Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==",
+ "version": "1.10.2",
+ "resolved": "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.10.2.tgz",
+ "integrity": "sha512-e3WzAsRKLor5EgK2bQqR1OY5D7VBqzORHtlqtygZZQGCYOIBsynqrZBa8MFD1Ue9r8TPtofOLditalnlQHS45Q==",
"dev": true,
"requires": {
"@azure/abort-controller": "^1.0.0",
@@ -11101,9 +11235,9 @@
}
},
"@azure/core-util": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.1.1.tgz",
- "integrity": "sha512-A4TBYVQCtHOigFb2ETiiKFDocBoI1Zk2Ui1KpI42aJSIDexF7DHQFpnjonltXAIU/ceH+1fsZAWWgvX6/AKzog==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@azure/core-util/-/core-util-1.2.0.tgz",
+ "integrity": "sha512-ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==",
"dev": true,
"requires": {
"@azure/abort-controller": "^1.0.0",
@@ -11143,27 +11277,27 @@
}
},
"@azure/logger": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.3.tgz",
- "integrity": "sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==",
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/@azure/logger/-/logger-1.0.4.tgz",
+ "integrity": "sha512-ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg==",
"dev": true,
"requires": {
"tslib": "^2.2.0"
}
},
"@azure/msal-browser": {
- "version": "2.33.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.33.0.tgz",
- "integrity": "sha512-c7CVh1tfUfxiWkEIhoIb11hL4PGo4hz0M+gMy34ATagAKdLK7qyEu/5AXJWAf5lz5eE+vQhm7+LKiuETrcXXGw==",
+ "version": "2.34.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.34.0.tgz",
+ "integrity": "sha512-stoXdlfAtyVIMOp1lS5PorgO5f66MGRi3Q1FBlXhVZFTsTfAWrNdSOx1m/PXWHskWE9aXO+NEzXVOoWmDNnvNA==",
"dev": true,
"requires": {
- "@azure/msal-common": "^10.0.0"
+ "@azure/msal-common": "^11.0.0"
},
"dependencies": {
"@azure/msal-common": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz",
- "integrity": "sha512-/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-11.0.0.tgz",
+ "integrity": "sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==",
"dev": true
}
}
@@ -11175,20 +11309,20 @@
"dev": true
},
"@azure/msal-node": {
- "version": "1.15.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.15.0.tgz",
- "integrity": "sha512-fwC5M0c8pxOAzmScPbpx7j28YVTDebUaizlVF7bR0xvlU0r3VWW5OobCcr9ybqKS6wGyO7u4EhXJS9rjRWAuwA==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.16.0.tgz",
+ "integrity": "sha512-eGXPp65i++mAIvziafbCH970TCeECB6iaQP7aRzZEjtU238cW4zKm40U8YxkiCn9rR1G2VeMHENB5h6WRk7ZCQ==",
"dev": true,
"requires": {
- "@azure/msal-common": "^10.0.0",
+ "@azure/msal-common": "^11.0.0",
"jsonwebtoken": "^9.0.0",
"uuid": "^8.3.0"
},
"dependencies": {
"@azure/msal-common": {
- "version": "10.0.0",
- "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-10.0.0.tgz",
- "integrity": "sha512-/LghpT93jsZLy55QzTsRZWMx6R1Mjc1Aktwps8sKSGE3WbrGwbSsh2uhDlpl6FMcKChYjJ0ochThWwwOodrQNg==",
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/@azure/msal-common/-/msal-common-11.0.0.tgz",
+ "integrity": "sha512-SZH8ObQ3Hq5v3ogVGBYJp1nNW7p+MtM4PH4wfNadBP9wf7K0beQHF9iOtRcjPOkwZf+ZD49oXqw91LndIkdk8g==",
"dev": true
},
"uuid": {
@@ -11200,13 +11334,13 @@
}
},
"@azure/storage-blob": {
- "version": "12.12.0",
- "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.12.0.tgz",
- "integrity": "sha512-o/Mf6lkyYG/eBW4/hXB9864RxVNmAkcKHjsGR6Inlp5hupa3exjSyH2KjO3tLO//YGA+tS+17hM2bxRl9Sn16g==",
+ "version": "12.13.0",
+ "resolved": "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.13.0.tgz",
+ "integrity": "sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA==",
"dev": true,
"requires": {
"@azure/abort-controller": "^1.0.0",
- "@azure/core-http": "^2.0.0",
+ "@azure/core-http": "^3.0.0",
"@azure/core-lro": "^2.2.0",
"@azure/core-paging": "^1.1.1",
"@azure/core-tracing": "1.0.0-preview.13",
@@ -11237,27 +11371,27 @@
}
},
"@babel/compat-data": {
- "version": "7.20.14",
- "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.20.14.tgz",
- "integrity": "sha512-0YpKHD6ImkWMEINCyDAD0HLLUH/lPCefG8ld9it8DJB2wnApraKuhgYTvTY1z7UFIfBTGy5LwncZ+5HWWGbhFw==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz",
+ "integrity": "sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g==",
"dev": true
},
"@babel/core": {
- "version": "7.20.12",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz",
- "integrity": "sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.21.0.tgz",
+ "integrity": "sha512-PuxUbxcW6ZYe656yL3EAhpy7qXKq0DmYsrJLpbB8XrsCP9Nm+XCg9XFMb5vIDliPD7+U/+M+QJlH17XOcB7eXA==",
"dev": true,
"requires": {
- "@ampproject/remapping": "^2.1.0",
+ "@ampproject/remapping": "^2.2.0",
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.7",
+ "@babel/generator": "^7.21.0",
"@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/helper-module-transforms": "^7.21.0",
+ "@babel/helpers": "^7.21.0",
+ "@babel/parser": "^7.21.0",
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.12",
- "@babel/types": "^7.20.7",
+ "@babel/traverse": "^7.21.0",
+ "@babel/types": "^7.21.0",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.2",
@@ -11283,13 +11417,14 @@
}
},
"@babel/generator": {
- "version": "7.20.14",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz",
- "integrity": "sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==",
+ "version": "7.21.1",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.1.tgz",
+ "integrity": "sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==",
"dev": true,
"requires": {
- "@babel/types": "^7.20.7",
+ "@babel/types": "^7.21.0",
"@jridgewell/gen-mapping": "^0.3.2",
+ "@jridgewell/trace-mapping": "^0.3.17",
"jsesc": "^2.5.1"
},
"dependencies": {
@@ -11326,13 +11461,13 @@
"dev": true
},
"@babel/helper-function-name": {
- "version": "7.19.0",
- "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
- "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz",
+ "integrity": "sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==",
"dev": true,
"requires": {
- "@babel/template": "^7.18.10",
- "@babel/types": "^7.19.0"
+ "@babel/template": "^7.20.7",
+ "@babel/types": "^7.21.0"
}
},
"@babel/helper-hoist-variables": {
@@ -11354,9 +11489,9 @@
}
},
"@babel/helper-module-transforms": {
- "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==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz",
+ "integrity": "sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==",
"dev": true,
"requires": {
"@babel/helper-environment-visitor": "^7.18.9",
@@ -11365,8 +11500,8 @@
"@babel/helper-split-export-declaration": "^7.18.6",
"@babel/helper-validator-identifier": "^7.19.1",
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.10",
- "@babel/types": "^7.20.7"
+ "@babel/traverse": "^7.21.2",
+ "@babel/types": "^7.21.2"
}
},
"@babel/helper-plugin-utils": {
@@ -11406,20 +11541,20 @@
"dev": true
},
"@babel/helper-validator-option": {
- "version": "7.18.6",
- "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
- "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz",
+ "integrity": "sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==",
"dev": true
},
"@babel/helpers": {
- "version": "7.20.13",
- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.20.13.tgz",
- "integrity": "sha512-nzJ0DWCL3gB5RCXbUO3KIMMsBY2Eqbx8mBpKGE/02PgyRQFcPQLbkQ1vyy596mZLaP+dAfD+R4ckASzNVmW3jg==",
+ "version": "7.21.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz",
+ "integrity": "sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==",
"dev": true,
"requires": {
"@babel/template": "^7.20.7",
- "@babel/traverse": "^7.20.13",
- "@babel/types": "^7.20.7"
+ "@babel/traverse": "^7.21.0",
+ "@babel/types": "^7.21.0"
}
},
"@babel/highlight": {
@@ -11492,9 +11627,9 @@
}
},
"@babel/parser": {
- "version": "7.20.15",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.20.15.tgz",
- "integrity": "sha512-DI4a1oZuf8wC+oAJA9RW6ga3Zbe8RZFt7kD9i4qAspz3I/yHet1VvC3DiSy/fsUvv5pvJuNPh0LPOdCcqinDPg==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.2.tgz",
+ "integrity": "sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==",
"dev": true
},
"@babel/plugin-syntax-async-generators": {
@@ -11626,19 +11761,19 @@
}
},
"@babel/traverse": {
- "version": "7.20.13",
- "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.20.13.tgz",
- "integrity": "sha512-kMJXfF0T6DIS9E8cgdLCSAL+cuCK+YEZHWiLK0SXpTo8YRj5lpJu3CDNKiIBCne4m9hhTIqUg6SYTAI39tAiVQ==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.2.tgz",
+ "integrity": "sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.18.6",
- "@babel/generator": "^7.20.7",
+ "@babel/generator": "^7.21.1",
"@babel/helper-environment-visitor": "^7.18.9",
- "@babel/helper-function-name": "^7.19.0",
+ "@babel/helper-function-name": "^7.21.0",
"@babel/helper-hoist-variables": "^7.18.6",
"@babel/helper-split-export-declaration": "^7.18.6",
- "@babel/parser": "^7.20.13",
- "@babel/types": "^7.20.7",
+ "@babel/parser": "^7.21.2",
+ "@babel/types": "^7.21.2",
"debug": "^4.1.0",
"globals": "^11.1.0"
},
@@ -11661,9 +11796,9 @@
}
},
"@babel/types": {
- "version": "7.20.7",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.20.7.tgz",
- "integrity": "sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==",
+ "version": "7.21.2",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.2.tgz",
+ "integrity": "sha512-3wRZSs7jiFaB8AjxiiD+VqN5DTG2iRvJGQ+qYFrs/654lg6kGTQWIOFjlBo5RaXuAZjBmP3+OQH4dmhqiiyYxw==",
"dev": true,
"requires": {
"@babel/helper-string-parser": "^7.19.4",
@@ -11677,123 +11812,6 @@
"integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
"dev": true
},
- "@cadl-lang/compiler": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/compiler/-/compiler-0.40.0.tgz",
- "integrity": "sha512-4u/Dnm39Ma+8wH0SDu7ya1+2oBRDiNByiRoijwyScHRec26UWLyWvHMvvU89ISU6O8Vwtq0bpmbD7FeJTnlbHw==",
- "dev": true,
- "requires": {
- "@babel/code-frame": "~7.18.6",
- "ajv": "~8.11.2",
- "change-case": "~4.1.2",
- "globby": "~13.1.1",
- "js-yaml": "~4.1.0",
- "mkdirp": "~1.0.4",
- "mustache": "~4.2.0",
- "node-fetch": "3.2.8",
- "node-watch": "~0.7.1",
- "picocolors": "~1.0.0",
- "prettier": "~2.8.1",
- "prompts": "~2.4.1",
- "vscode-languageserver": "~8.0.2",
- "vscode-languageserver-textdocument": "~1.0.1",
- "yargs": "~17.6.2"
- },
- "dependencies": {
- "ajv": {
- "version": "8.11.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
- "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
- "dev": true,
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "json-schema-traverse": "^1.0.0",
- "require-from-string": "^2.0.2",
- "uri-js": "^4.2.2"
- }
- },
- "json-schema-traverse": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
- "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
- "dev": true
- },
- "node-fetch": {
- "version": "3.2.8",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.8.tgz",
- "integrity": "sha512-KtpD1YhGszhntMpBDyp5lyagk8KIMopC1LEb7cQUAh7zcosaX5uK8HnbNb2i3NTQK3sIawCItS0uFC3QzcLHdg==",
- "dev": true,
- "requires": {
- "data-uri-to-buffer": "^4.0.0",
- "fetch-blob": "^3.1.4",
- "formdata-polyfill": "^4.0.10"
- }
- }
- }
- },
- "@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",
- "integrity": "sha512-H8vM1K/8zyV7lQpT8XPf6VYMz52cil8DUVawdq3JkGrnunLC7woPhzr2Sl9uPg6e9vsiqRi9ZUmB51MIEaO1gA==",
- "dev": true,
- "requires": {
- "@rushstack/eslint-patch": "1.1.0 ",
- "@typescript-eslint/eslint-plugin": "^5.30.7",
- "@typescript-eslint/parser": "^5.30.7",
- "eslint": "^8.12.0",
- "eslint-config-prettier": "^8.5.0",
- "eslint-plugin-mocha": "^10.0.5",
- "eslint-plugin-prettier": "^4.0.0",
- "eslint-plugin-unicorn": "^42.0.0",
- "typescript": "~4.9.3"
- }
- },
- "@cadl-lang/eslint-plugin": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/eslint-plugin/-/eslint-plugin-0.40.0.tgz",
- "integrity": "sha512-crtHt6tH/1NrhV+9NgpuIk9Un25LIOdZJT2K4H8Eoww5UUQYj3Xp9zhi2nQB0yFk9wQsuI6MjYn97WoD3yUpng==",
- "dev": true,
- "requires": {
- "@typescript-eslint/utils": "~5.26.0"
- }
- },
- "@cadl-lang/library-linter": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/library-linter/-/library-linter-0.40.0.tgz",
- "integrity": "sha512-3VdDcnh32av6ha3BSEGYhS/h6G9JQV70K0N13AcsW0M5aaCjpv9ewbQa4vl7xa31tDlR+pBUDbobwJG5Ij5vHw==",
- "dev": true,
- "requires": {}
- },
- "@cadl-lang/lint": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/lint/-/lint-0.40.0.tgz",
- "integrity": "sha512-V/V5Msuurhb7kVZsvuAKVAHq4twmC5YC5k/t7YJWETOowFXepgIneWJPH2TDyyzO9WqJjqRJVRXPTrTuKuNFsA==",
- "dev": true,
- "requires": {}
- },
- "@cadl-lang/openapi": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/openapi/-/openapi-0.40.0.tgz",
- "integrity": "sha512-M2/Pb5AyZd2O5ycYBIoIf4bufip7bCUTMt3gdom1ss6726APbG1fxx98HPcTbXXx0oA+SuqEXtz8k9eaUGLadQ==",
- "dev": true,
- "requires": {}
- },
- "@cadl-lang/rest": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/rest/-/rest-0.40.0.tgz",
- "integrity": "sha512-WfGq6lN87adRKsKd3XtztvOLXHzyFlDRQiEcXKfnwXia37zVwK355KX39P1RimQ9mpDsmXaGG4ETkdUSWvXe7w==",
- "dev": true,
- "requires": {}
- },
- "@cadl-lang/versioning": {
- "version": "0.40.0",
- "resolved": "https://registry.npmjs.org/@cadl-lang/versioning/-/versioning-0.40.0.tgz",
- "integrity": "sha512-HK/jw0kxo/6RwbnR7nPyCj2kJ94uZbBhEmS08ms+fX4UB4nDNBXqXFwMwgftVZ2qdS9xEkRhLqpVYfEPzlFBJw==",
- "dev": true,
- "requires": {
- "@cadl-lang/compiler": "~0.40.0"
- }
- },
"@colors/colors": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
@@ -11812,9 +11830,9 @@
}
},
"@eslint/eslintrc": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.1.tgz",
- "integrity": "sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.0.tgz",
+ "integrity": "sha512-fluIaaV+GyV24CCu/ggiHdV+j4RNh85yQnAYS/G2mZODZgGmmlrgCydjUcV3YvxCm9x8nMAfThsqTni4KiXT4A==",
"dev": true,
"requires": {
"ajv": "^6.12.4",
@@ -11828,6 +11846,18 @@
"strip-json-comments": "^3.1.1"
},
"dependencies": {
+ "ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
"debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -11846,6 +11876,12 @@
"type-fest": "^0.20.2"
}
},
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -11860,6 +11896,12 @@
}
}
},
+ "@eslint/js": {
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.35.0.tgz",
+ "integrity": "sha512-JXdzbRiWclLVoD8sNUjR443VVlYqiYmDVT6rGUEIEHU5YJW0gaVZwV2xgM7D4arkvASqD0IlLUVjHiFuxaftRw==",
+ "dev": true
+ },
"@humanwhocodes/config-array": {
"version": "0.11.8",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz",
@@ -12376,9 +12418,9 @@
"dev": true
},
"@types/node": {
- "version": "18.13.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-18.13.0.tgz",
- "integrity": "sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==",
+ "version": "18.15.0",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-18.15.0.tgz",
+ "integrity": "sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w==",
"dev": true
},
"@types/node-fetch": {
@@ -12446,14 +12488,14 @@
"dev": true
},
"@typescript-eslint/eslint-plugin": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.52.0.tgz",
- "integrity": "sha512-lHazYdvYVsBokwCdKOppvYJKaJ4S41CgKBcPvyd0xjZNbvQdhn/pnJlGtQksQ/NhInzdaeaSarlBjDXHuclEbg==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.54.1.tgz",
+ "integrity": "sha512-a2RQAkosH3d3ZIV08s3DcL/mcGc2M/UC528VkPULFxR9VnVPT8pBu0IyBAJJmVsCmhVfwQX1v6q+QGnmSe1bew==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/type-utils": "5.52.0",
- "@typescript-eslint/utils": "5.52.0",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/type-utils": "5.54.1",
+ "@typescript-eslint/utils": "5.54.1",
"debug": "^4.3.4",
"grapheme-splitter": "^1.0.4",
"ignore": "^5.2.0",
@@ -12463,22 +12505,6 @@
"tsutils": "^3.21.0"
},
"dependencies": {
- "@typescript-eslint/utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz",
- "integrity": "sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==",
- "dev": true,
- "requires": {
- "@types/json-schema": "^7.0.9",
- "@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
- "eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0",
- "semver": "^7.3.7"
- }
- },
"debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -12521,14 +12547,14 @@
}
},
"@typescript-eslint/parser": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.52.0.tgz",
- "integrity": "sha512-e2KiLQOZRo4Y0D/b+3y08i3jsekoSkOYStROYmPUnGMEoA0h+k2qOH5H6tcjIc68WDvGwH+PaOrP1XRzLJ6QlA==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.54.1.tgz",
+ "integrity": "sha512-8zaIXJp/nG9Ff9vQNh7TI+C3nA6q6iIsGJ4B4L6MhZ7mHnTMR4YP5vp2xydmFXIy8rpyIVbNAG44871LMt6ujg==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/typescript-estree": "5.54.1",
"debug": "^4.3.4"
},
"dependencies": {
@@ -12550,43 +12576,27 @@
}
},
"@typescript-eslint/scope-manager": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.52.0.tgz",
- "integrity": "sha512-AR7sxxfBKiNV0FWBSARxM8DmNxrwgnYMPwmpkC1Pl1n+eT8/I2NAUPuwDy/FmDcC6F8pBfmOcaxcxRHspgOBMw==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.54.1.tgz",
+ "integrity": "sha512-zWKuGliXxvuxyM71UA/EcPxaviw39dB2504LqAmFDjmkpO8qNLHcmzlh6pbHs1h/7YQ9bnsO8CCcYCSA8sykUg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/visitor-keys": "5.52.0"
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/visitor-keys": "5.54.1"
}
},
"@typescript-eslint/type-utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.52.0.tgz",
- "integrity": "sha512-tEKuUHfDOv852QGlpPtB3lHOoig5pyFQN/cUiZtpw99D93nEBjexRLre5sQZlkMoHry/lZr8qDAt2oAHLKA6Jw==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.54.1.tgz",
+ "integrity": "sha512-WREHsTz0GqVYLIbzIZYbmUUr95DKEKIXZNH57W3s+4bVnuF1TKe2jH8ZNH8rO1CeMY3U4j4UQeqPNkHMiGem3g==",
"dev": true,
"requires": {
- "@typescript-eslint/typescript-estree": "5.52.0",
- "@typescript-eslint/utils": "5.52.0",
+ "@typescript-eslint/typescript-estree": "5.54.1",
+ "@typescript-eslint/utils": "5.54.1",
"debug": "^4.3.4",
"tsutils": "^3.21.0"
},
"dependencies": {
- "@typescript-eslint/utils": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.52.0.tgz",
- "integrity": "sha512-As3lChhrbwWQLNk2HC8Ree96hldKIqk98EYvypd3It8Q1f8d5zWyIoaZEp2va5667M4ZyE7X8UUR+azXrFl+NA==",
- "dev": true,
- "requires": {
- "@types/json-schema": "^7.0.9",
- "@types/semver": "^7.3.12",
- "@typescript-eslint/scope-manager": "5.52.0",
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/typescript-estree": "5.52.0",
- "eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0",
- "semver": "^7.3.7"
- }
- },
"debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -12596,52 +12606,28 @@
"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",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
- },
- "semver": {
- "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
}
}
},
"@typescript-eslint/types": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.52.0.tgz",
- "integrity": "sha512-oV7XU4CHYfBhk78fS7tkum+/Dpgsfi91IIDy7fjCyq2k6KB63M6gMC0YIvy+iABzmXThCRI6xpCEyVObBdWSDQ==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.54.1.tgz",
+ "integrity": "sha512-G9+1vVazrfAfbtmCapJX8jRo2E4MDXxgm/IMOF4oGh3kq7XuK3JRkOg6y2Qu1VsTRmWETyTkWt1wxy7X7/yLkw==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.52.0.tgz",
- "integrity": "sha512-WeWnjanyEwt6+fVrSR0MYgEpUAuROxuAH516WPjUblIrClzYJj0kBbjdnbQXLpgAN8qbEuGywiQsXUVDiAoEuQ==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.54.1.tgz",
+ "integrity": "sha512-bjK5t+S6ffHnVwA0qRPTZrxKSaFYocwFIkZx5k7pvWfsB1I57pO/0M0Skatzzw1sCkjJ83AfGTL0oFIFiDX3bg==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.52.0",
- "@typescript-eslint/visitor-keys": "5.52.0",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/visitor-keys": "5.54.1",
"debug": "^4.3.4",
"globby": "^11.1.0",
"is-glob": "^4.0.3",
@@ -12705,17 +12691,127 @@
}
},
"@typescript-eslint/utils": {
- "version": "5.26.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
- "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.54.1.tgz",
+ "integrity": "sha512-IY5dyQM8XD1zfDe5X8jegX6r2EVU5o/WJnLu/znLPWCBF7KNGC+adacXnt5jEYS9JixDcoccI6CvE4RCjHMzCQ==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.9",
- "@typescript-eslint/scope-manager": "5.26.0",
- "@typescript-eslint/types": "5.26.0",
- "@typescript-eslint/typescript-estree": "5.26.0",
+ "@types/semver": "^7.3.12",
+ "@typescript-eslint/scope-manager": "5.54.1",
+ "@typescript-eslint/types": "5.54.1",
+ "@typescript-eslint/typescript-estree": "5.54.1",
"eslint-scope": "^5.1.1",
- "eslint-utils": "^3.0.0"
+ "eslint-utils": "^3.0.0",
+ "semver": "^7.3.7"
+ },
+ "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",
+ "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
+ }
+ }
+ },
+ "@typescript-eslint/visitor-keys": {
+ "version": "5.54.1",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.54.1.tgz",
+ "integrity": "sha512-q8iSoHTgwCfgcRJ2l2x+xCbu8nBlRAlsQ33k24Adj8eoVBE0f8dUeI+bAa8F84Mv05UGbAx57g2zrRsYIooqQg==",
+ "dev": true,
+ "requires": {
+ "@typescript-eslint/types": "5.54.1",
+ "eslint-visitor-keys": "^3.3.0"
+ }
+ },
+ "@typespec/compiler": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/compiler/-/compiler-0.41.0.tgz",
+ "integrity": "sha512-JmSclmneBmWiv2+ROFBhAl69uylIdLVnElB3Xr/hHPza9mcMRz7HR0Zi2tvjATsvPkIUgcoUM/pVXLhNjKeMLw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "~7.18.6",
+ "ajv": "~8.11.2",
+ "change-case": "~4.1.2",
+ "globby": "~13.1.1",
+ "js-yaml": "~4.1.0",
+ "mkdirp": "~1.0.4",
+ "mustache": "~4.2.0",
+ "node-fetch": "3.2.8",
+ "node-watch": "~0.7.1",
+ "picocolors": "~1.0.0",
+ "prettier": "~2.8.1",
+ "prompts": "~2.4.1",
+ "vscode-languageserver": "~8.0.2",
+ "vscode-languageserver-textdocument": "~1.0.1",
+ "yargs": "~17.6.2"
+ },
+ "dependencies": {
+ "yargs": {
+ "version": "17.6.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+ "dev": true,
+ "requires": {
+ "cliui": "^8.0.1",
+ "escalade": "^3.1.1",
+ "get-caller-file": "^2.0.5",
+ "require-directory": "^2.1.1",
+ "string-width": "^4.2.3",
+ "y18n": "^5.0.5",
+ "yargs-parser": "^21.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "dev": true
+ }
+ }
+ },
+ "@typespec/eslint-config-typespec": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/@typespec/eslint-config-typespec/-/eslint-config-typespec-0.6.0.tgz",
+ "integrity": "sha512-ZjANoGn+kLr8lDlP5RijeTqKLvVMjq7Vr98dQT8jrz41i+Oal6eCLwHc7JdmssFF9d/czsVaWlBcLH//r3KMLg==",
+ "dev": true,
+ "requires": {
+ "@rushstack/eslint-patch": "1.1.0 ",
+ "@typescript-eslint/eslint-plugin": "^5.30.7",
+ "@typescript-eslint/parser": "^5.30.7",
+ "eslint": "^8.12.0",
+ "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-mocha": "^10.0.5",
+ "eslint-plugin-prettier": "^4.0.0",
+ "eslint-plugin-unicorn": "^42.0.0",
+ "typescript": "~4.9.3"
+ }
+ },
+ "@typespec/eslint-plugin": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/eslint-plugin/-/eslint-plugin-0.41.0.tgz",
+ "integrity": "sha512-0yTYUKvZNfpqqtisF5whEwfXDPKkwKZifB8D1yJnG1xnjdlg06X/tqIxugyMfwWigmog0ymtr6/7vFdXUTcjdg==",
+ "dev": true,
+ "requires": {
+ "@typescript-eslint/utils": "~5.26.0"
},
"dependencies": {
"@typescript-eslint/scope-manager": {
@@ -12749,6 +12845,20 @@
"tsutils": "^3.21.0"
}
},
+ "@typescript-eslint/utils": {
+ "version": "5.26.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.26.0.tgz",
+ "integrity": "sha512-PJFwcTq2Pt4AMOKfe3zQOdez6InIDOjUJJD3v3LyEtxHGVVRK3Vo7Dd923t/4M9hSH2q2CLvcTdxlLPjcIk3eg==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.9",
+ "@typescript-eslint/scope-manager": "5.26.0",
+ "@typescript-eslint/types": "5.26.0",
+ "@typescript-eslint/typescript-estree": "5.26.0",
+ "eslint-scope": "^5.1.1",
+ "eslint-utils": "^3.0.0"
+ }
+ },
"@typescript-eslint/visitor-keys": {
"version": "5.26.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz",
@@ -12814,14 +12924,48 @@
}
}
},
- "@typescript-eslint/visitor-keys": {
- "version": "5.52.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.52.0.tgz",
- "integrity": "sha512-qMwpw6SU5VHCPr99y274xhbm+PRViK/NATY6qzt+Et7+mThGuFSl/ompj2/hrBlRP/kq+BFdgagnOSgw9TB0eA==",
+ "@typespec/http": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/http/-/http-0.41.0.tgz",
+ "integrity": "sha512-lKewobsQVlpEUWCH/jw3eodugCqR9VqSP3a7iM9IrhULjhNExLQ7GHR6GpKyxBLSMq8mqThrC0u0hLJNd0iRuQ==",
+ "dev": true,
+ "requires": {}
+ },
+ "@typespec/library-linter": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/library-linter/-/library-linter-0.41.0.tgz",
+ "integrity": "sha512-0ShRGpB+CzUP9y54EEkOBTEddTT3PHBBVFX9y97qZHTf1JdBifD4ykdvCX+zrR/dN3EZWrpTG3+k/wXf77uKDg==",
+ "dev": true,
+ "requires": {}
+ },
+ "@typespec/lint": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/lint/-/lint-0.41.0.tgz",
+ "integrity": "sha512-Xv54f+Nj+WWf+fq6AQk36QHO/bMKMltNwOwYXqV/51yzgc3VBk7wlHeGq+J9A7pW8WsV7T1nkdRCg2d7GaXPcw==",
+ "dev": true,
+ "requires": {}
+ },
+ "@typespec/openapi": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/openapi/-/openapi-0.41.0.tgz",
+ "integrity": "sha512-0zfmsorziqlaPHxM6ZckmLUlu7L4qY/BKO//uHA49UjSVWzMfq8O4szFYtQpaBjDMhsOV5AQRAF/elz6gMcqsg==",
+ "dev": true,
+ "requires": {}
+ },
+ "@typespec/rest": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/rest/-/rest-0.41.0.tgz",
+ "integrity": "sha512-C3pAvXDzwe42H+4pdHXV5NiCFFZX8+igTLQR5aKZUixng9sN+Uz0PTv3QWGgHSBZvP+webTCswGDfHDLJotNxA==",
+ "dev": true,
+ "requires": {}
+ },
+ "@typespec/versioning": {
+ "version": "0.41.0",
+ "resolved": "https://registry.npmjs.org/@typespec/versioning/-/versioning-0.41.0.tgz",
+ "integrity": "sha512-B1zHxzPVZ1ZUHE7ZDPhjjhe0tx6mk0UfPNV2sALrk5VVPFeXQSK4DJcB6vvvSpBoPOqtb81/wKENsYAM7Vfmog==",
"dev": true,
"requires": {
- "@typescript-eslint/types": "5.52.0",
- "eslint-visitor-keys": "^3.3.0"
+ "@typespec/compiler": "~0.41.0"
}
},
"@ungap/promise-all-settled": {
@@ -12910,14 +13054,14 @@
}
},
"ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "version": "8.11.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.2.tgz",
+ "integrity": "sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
+ "json-schema-traverse": "^1.0.0",
+ "require-from-string": "^2.0.2",
"uri-js": "^4.2.2"
}
},
@@ -13186,13 +13330,13 @@
"dev": true
},
"body-parser": {
- "version": "1.20.1",
- "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
- "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "version": "1.20.2",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz",
+ "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==",
"dev": true,
"requires": {
"bytes": "3.1.2",
- "content-type": "~1.0.4",
+ "content-type": "~1.0.5",
"debug": "2.6.9",
"depd": "2.0.0",
"destroy": "1.2.0",
@@ -13200,7 +13344,7 @@
"iconv-lite": "0.4.24",
"on-finished": "2.4.1",
"qs": "6.11.0",
- "raw-body": "2.5.1",
+ "raw-body": "2.5.2",
"type-is": "~1.6.18",
"unpipe": "1.0.0"
}
@@ -13434,9 +13578,9 @@
"dev": true
},
"caniuse-lite": {
- "version": "1.0.30001452",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001452.tgz",
- "integrity": "sha512-Lkp0vFjMkBB3GTpLR8zk4NwW5EdRdnitwYJHDOOKIU85x4ckYCPQ+9WlVvSVClHxVReefkUMtWZH2l9KGlD51w==",
+ "version": "1.0.30001464",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001464.tgz",
+ "integrity": "sha512-oww27MtUmusatpRpCGSOneQk2/l5czXANDSFvsc7VuOQ86s3ANhZetpwXNf1zY/zdfP63Xvjz325DAdAoES13g==",
"dev": true
},
"capital-case": {
@@ -13966,9 +14110,9 @@
"dev": true
},
"electron-to-chromium": {
- "version": "1.4.296",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.296.tgz",
- "integrity": "sha512-i/6Q+Y9bluDa2a0NbMvdtG5TuS/1Fr3TKK8L+7UUL9QjRS5iFJzCC3r70xjyOnLiYG8qGV4/mMpe6HuAbdJW4w==",
+ "version": "1.4.327",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.327.tgz",
+ "integrity": "sha512-DIk2H4g/3ZhjgiABJjVdQvUdMlSABOsjeCm6gmUzIdKxAuFrGiJ8QXMm3i09grZdDBMC/d8MELMrdwYRC0+YHg==",
"dev": true
},
"emittery": {
@@ -14040,9 +14184,9 @@
"dev": true
},
"escape-string-regexp": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
- "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
"dev": true
},
"escodegen": {
@@ -14056,15 +14200,63 @@
"esutils": "^2.0.2",
"optionator": "^0.8.1",
"source-map": "~0.6.1"
+ },
+ "dependencies": {
+ "estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true
+ },
+ "levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
+ }
+ },
+ "optionator": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "dev": true,
+ "requires": {
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.6",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "word-wrap": "~1.2.3"
+ }
+ },
+ "prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+ "dev": true
+ },
+ "type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "~1.1.2"
+ }
+ }
}
},
"eslint": {
- "version": "8.34.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.34.0.tgz",
- "integrity": "sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg==",
+ "version": "8.35.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.35.0.tgz",
+ "integrity": "sha512-BxAf1fVL7w+JLRQhWl2pzGeSiGqbWumV4WNvc9Rhp6tiCtm4oHnyPBSEtMGZwrQgudFQ+otqzWoPB7x+hxoWsw==",
"dev": true,
"requires": {
- "@eslint/eslintrc": "^1.4.1",
+ "@eslint/eslintrc": "^2.0.0",
+ "@eslint/js": "8.35.0",
"@humanwhocodes/config-array": "^0.11.8",
"@humanwhocodes/module-importer": "^1.0.1",
"@nodelib/fs.walk": "^1.2.8",
@@ -14078,7 +14270,7 @@
"eslint-utils": "^3.0.0",
"eslint-visitor-keys": "^3.3.0",
"espree": "^9.4.0",
- "esquery": "^1.4.0",
+ "esquery": "^1.4.2",
"esutils": "^2.0.2",
"fast-deep-equal": "^3.1.3",
"file-entry-cache": "^6.0.1",
@@ -14105,6 +14297,18 @@
"text-table": "^0.2.0"
},
"dependencies": {
+ "ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
"debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -14114,12 +14318,6 @@
"ms": "2.1.2"
}
},
- "escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true
- },
"eslint-scope": {
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz",
@@ -14130,6 +14328,12 @@
"estraverse": "^5.2.0"
}
},
+ "estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true
+ },
"find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -14149,15 +14353,11 @@
"type-fest": "^0.20.2"
}
},
- "levn": {
+ "json-schema-traverse": {
"version": "0.4.1",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
- "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
- "dev": true,
- "requires": {
- "prelude-ls": "^1.2.1",
- "type-check": "~0.4.0"
- }
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
},
"locate-path": {
"version": "6.0.0",
@@ -14174,20 +14374,6 @@
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
- "optionator": {
- "version": "0.9.1",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
- "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
- "dev": true,
- "requires": {
- "deep-is": "^0.1.3",
- "fast-levenshtein": "^2.0.6",
- "levn": "^0.4.1",
- "prelude-ls": "^1.2.1",
- "type-check": "^0.4.0",
- "word-wrap": "^1.2.3"
- }
- },
"p-limit": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
@@ -14206,21 +14392,6 @@
"p-limit": "^3.0.2"
}
},
- "prelude-ls": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
- "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
- "dev": true
- },
- "type-check": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
- "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
- "dev": true,
- "requires": {
- "prelude-ls": "^1.2.1"
- }
- },
"type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
@@ -14230,9 +14401,9 @@
}
},
"eslint-config-prettier": {
- "version": "8.6.0",
- "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz",
- "integrity": "sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.7.0.tgz",
+ "integrity": "sha512-HHVXLSlVUhMSmyW4ZzEuvjpwqamgmlfkutD53cYXLikh4pt/modINRcCIApJ84czDxM4GZInwUrromsDdTImTA==",
"dev": true,
"requires": {}
},
@@ -14311,14 +14482,6 @@
"requires": {
"esrecurse": "^4.3.0",
"estraverse": "^4.1.1"
- },
- "dependencies": {
- "estraverse": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
- "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
- "dev": true
- }
}
},
"eslint-utils": {
@@ -14362,12 +14525,20 @@
"dev": true
},
"esquery": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
- "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
"dev": true,
"requires": {
"estraverse": "^5.1.0"
+ },
+ "dependencies": {
+ "estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true
+ }
}
},
"esrecurse": {
@@ -14377,12 +14548,20 @@
"dev": true,
"requires": {
"estraverse": "^5.2.0"
+ },
+ "dependencies": {
+ "estraverse": {
+ "version": "5.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+ "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "dev": true
+ }
}
},
"estraverse": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
- "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
"dev": true
},
"esutils": {
@@ -14475,6 +14654,40 @@
"type-is": "~1.6.18",
"utils-merge": "1.0.1",
"vary": "~1.1.2"
+ },
+ "dependencies": {
+ "body-parser": {
+ "version": "1.20.1",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+ "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+ "dev": true,
+ "requires": {
+ "bytes": "3.1.2",
+ "content-type": "~1.0.4",
+ "debug": "2.6.9",
+ "depd": "2.0.0",
+ "destroy": "1.2.0",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.4.1",
+ "qs": "6.11.0",
+ "raw-body": "2.5.1",
+ "type-is": "~1.6.18",
+ "unpipe": "1.0.0"
+ }
+ },
+ "raw-body": {
+ "version": "2.5.1",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+ "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "dev": true,
+ "requires": {
+ "bytes": "3.1.2",
+ "http-errors": "2.0.0",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
+ }
+ }
}
},
"express-promise-router": {
@@ -14725,14 +14938,6 @@
"graceful-fs": "^4.2.0",
"jsonfile": "^6.0.1",
"universalify": "^2.0.0"
- },
- "dependencies": {
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true
- }
}
},
"fs.realpath": {
@@ -14895,6 +15100,26 @@
"requires": {
"ajv": "^6.12.3",
"har-schema": "^2.0.0"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.12.6",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+ "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^3.1.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ }
}
},
"has": {
@@ -14954,9 +15179,9 @@
},
"dependencies": {
"readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -15187,13 +15412,13 @@
}
},
"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==",
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+ "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
"dev": true,
"requires": {
"call-bind": "^1.0.2",
- "get-intrinsic": "^1.1.3",
+ "get-intrinsic": "^1.2.0",
"is-typed-array": "^1.1.10"
}
},
@@ -16150,9 +16375,9 @@
"dev": true
},
"json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
"dev": true
},
"json-serialize-refs": {
@@ -16187,14 +16412,6 @@
"requires": {
"graceful-fs": "^4.1.6",
"universalify": "^2.0.0"
- },
- "dependencies": {
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true
- }
}
},
"jsonparse": {
@@ -16320,13 +16537,13 @@
"dev": true
},
"levn": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
- "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2"
+ "prelude-ls": "^1.2.1",
+ "type-check": "~0.4.0"
}
},
"lines-and-columns": {
@@ -16619,12 +16836,6 @@
}
}
},
- "escape-string-regexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
- "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
- "dev": true
- },
"find-up": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
@@ -16811,9 +17022,9 @@
"dev": true
},
"node-fetch": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.0.tgz",
- "integrity": "sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==",
+ "version": "3.2.8",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.8.tgz",
+ "integrity": "sha512-KtpD1YhGszhntMpBDyp5lyagk8KIMopC1LEb7cQUAh7zcosaX5uK8HnbNb2i3NTQK3sIawCItS0uFC3QzcLHdg==",
"dev": true,
"requires": {
"data-uri-to-buffer": "^4.0.0",
@@ -16963,9 +17174,9 @@
}
},
"open": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/open/-/open-8.4.1.tgz",
- "integrity": "sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==",
+ "version": "8.4.2",
+ "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+ "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
"dev": true,
"requires": {
"define-lazy-prop": "^2.0.0",
@@ -16974,17 +17185,17 @@
}
},
"optionator": {
- "version": "0.8.3",
- "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
- "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "version": "0.9.1",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+ "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
"dev": true,
"requires": {
- "deep-is": "~0.1.3",
- "fast-levenshtein": "~2.0.6",
- "levn": "~0.3.0",
- "prelude-ls": "~1.1.2",
- "type-check": "~0.3.2",
- "word-wrap": "~1.2.3"
+ "deep-is": "^0.1.3",
+ "fast-levenshtein": "^2.0.6",
+ "levn": "^0.4.1",
+ "prelude-ls": "^1.2.1",
+ "type-check": "^0.4.0",
+ "word-wrap": "^1.2.3"
}
},
"p-limit": {
@@ -17150,9 +17361,9 @@
"dev": true
},
"prelude-ls": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
- "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
"dev": true
},
"prettier": {
@@ -17255,9 +17466,9 @@
"dev": true
},
"rambda": {
- "version": "7.4.0",
- "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.4.0.tgz",
- "integrity": "sha512-A9hihu7dUTLOUCM+I8E61V4kRXnN4DwYeK0DwCBydC1MqNI1PidyAtbtpsJlBBzK4icSctEcCQ1bGcLpBuETUQ==",
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/rambda/-/rambda-7.5.0.tgz",
+ "integrity": "sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==",
"dev": true
},
"randombytes": {
@@ -17276,9 +17487,9 @@
"dev": true
},
"raw-body": {
- "version": "2.5.1",
- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
- "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+ "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
"dev": true,
"requires": {
"bytes": "3.1.2",
@@ -17333,9 +17544,9 @@
}
},
"readable-stream": {
- "version": "2.3.7",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
- "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
"dev": true,
"requires": {
"core-util-is": "~1.0.0",
@@ -17759,9 +17970,9 @@
}
},
"spdx-correct": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
- "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
"dev": true,
"requires": {
"spdx-expression-parse": "^3.0.0",
@@ -17826,6 +18037,14 @@
"dev": true,
"requires": {
"escape-string-regexp": "^2.0.0"
+ },
+ "dependencies": {
+ "escape-string-regexp": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+ "dev": true
+ }
}
},
"statuses": {
@@ -18048,6 +18267,14 @@
"punycode": "^2.1.1",
"universalify": "^0.2.0",
"url-parse": "^1.5.3"
+ },
+ "dependencies": {
+ "universalify": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+ "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "dev": true
+ }
}
},
"tr46": {
@@ -18152,12 +18379,12 @@
"dev": true
},
"type-check": {
- "version": "0.3.2",
- "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
- "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
"dev": true,
"requires": {
- "prelude-ls": "~1.1.2"
+ "prelude-ls": "^1.2.1"
}
},
"type-detect": {
@@ -18204,9 +18431,9 @@
"dev": true
},
"universalify": {
- "version": "0.2.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
- "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
"dev": true
},
"unpipe": {
@@ -18510,9 +18737,9 @@
},
"dependencies": {
"readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -18534,9 +18761,9 @@
},
"dependencies": {
"readable-stream": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
- "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz",
+ "integrity": "sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -18643,9 +18870,9 @@
"dev": true
},
"yargs": {
- "version": "17.6.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",
- "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==",
+ "version": "17.7.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz",
+ "integrity": "sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw==",
"dev": true,
"requires": {
"cliui": "^8.0.1",
diff --git a/package.json b/package.json
index e593e688f6c..4d63da7eefd 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"private": true,
"description": "package.json intended for in-repo use only, package.json used for publishing is located in src/AutoRest.CSharp/package.json",
"devDependencies": {
- "@azure-tools/cadl-csharp": "src/CADL.Extension/Emitter.Csharp",
+ "@azure-tools/typespec-csharp": "src/CADL.Extension/Emitter.Csharp",
"@azure-tools/cadl-ranch-mockapis": "file:test/CadlRanchMockApis",
"@microsoft.azure/autorest.testserver": "3.3.24",
"autorest": "3.6.1"
diff --git a/readme.md b/readme.md
index 86ebc6c0004..4ec4b2001b1 100644
--- a/readme.md
+++ b/readme.md
@@ -92,14 +92,14 @@ When the automatic PR is created for azure-sdk-for-net if there are any issues f
- This is not intended to be checked in but is a temporary change so `dotnet restore` can find the package
- If your generator PR needs to apply to typespec/cadl projects, or your generator PR changes anything in our emitter (the `src\CADL.Extension\Emitter.Csharp` project), you will need to
1. Update the `version` in `src\CADL.Extension\Emitter.Csharp\package.json`
- 2. Run `npm pack` command in `src\CADL.Extension\Emitter.Csharp` directory. This will produce a pack like `src\CADL.Extension\Emitter.Csharp\azure-tools-cadl-csharp-x.y.z.tgz` where `x.y.z` is the version number you set in step 1.
+ 2. Run `npm pack` command in `src\CADL.Extension\Emitter.Csharp` directory. This will produce a pack like `src\CADL.Extension\Emitter.Csharp\azure-tools-typespec-csharp-x.y.z.tgz` where `x.y.z` is the version number you set in step 1.
3. Change the emitter version used in our `azure-sdk-for-net` repo in this file `eng\emitter-package.json` like this:
```diff
{
"main": "dist/src/index.js",
"dependencies": {
- - "@azure-tools/cadl-csharp": "0.1.11-beta.20230212.4"
- + "@azure-tools/cadl-csharp": "/absolute/path/to/src/CADL.Extension/Emitter.Csharp/azure-tools-cadl-csharp-x.y.z.tgz"
+ - "@azure-tools/typespec-csharp": "0.1.11-beta.20230212.4"
+ + "@azure-tools/typespec-csharp": "/absolute/path/to/src/CADL.Extension/Emitter.Csharp/azure-tools-typespec-csharp-x.y.z.tgz"
}
}
```
@@ -108,7 +108,7 @@ When the automatic PR is created for azure-sdk-for-net if there are any issues f
To regen and test everything in azure-sdk-for-net after you have updated to use your new local build do the following:
-- First generate all projects in the repo by executing `dotnet build [RepoRoot]/eng/service.proj /t:GenerateCode`. If your generator PR needs to apply to typespec/cadl projects, or your generator PR changes anything in our emitter (the `src\CADL.Extension\Emitter.Csharp` project), you will need to run `dotnet build [RepoRoot]/eng/service.proj /t:GenerateCode /p:CadlAdditionalOptions="csharpGeneratorPath=/absolute/path/to/artifacts/bin/AutoRest.CSharp/Debug/net6.0/AutoRest.CSharp.dll`.
+- First generate all projects in the repo by executing `dotnet build [RepoRoot]/eng/service.proj /t:GenerateCode`. If your generator PR needs to apply to typespec/cadl projects, or your generator PR changes anything in our emitter (the `src\CADL.Extension\Emitter.Csharp` project), you will need to run `dotnet build [RepoRoot]/eng/service.proj /t:GenerateCode /p:typespecAdditionalOptions="csharpGeneratorPath=/absolute/path/to/artifacts/bin/AutoRest.CSharp/Debug/net6.0/AutoRest.CSharp.dll`.
- Next we want to at minimum run the tests against the new generated code by using `dotnet test [RepoRoot]/eng/service.proj --filter "(TestCategory!=Manually) & (TestCategory!=Live)"`
- For non GA libraries there could be API changes so we want to run the Export-API script with no parameters which will update any projects that now have an API change `[RepoRoot]\eng\scripts\Export-API.ps1`
- Finally it is very possible that we will need to make test case changes or snippet changes especially for non GA libraries which have expected changes. All of these should be made in the branch and included in the PR to demonstrate all resulting changes from the autorest.csharp PR.
diff --git a/samples/AnomalyDetector/client.cadl b/samples/AnomalyDetector/client.tsp
similarity index 87%
rename from samples/AnomalyDetector/client.cadl
rename to samples/AnomalyDetector/client.tsp
index 3801beafead..7795737ece0 100644
--- a/samples/AnomalyDetector/client.cadl
+++ b/samples/AnomalyDetector/client.tsp
@@ -1,7 +1,7 @@
-import "@azure-tools/cadl-dpg";
-import "./main.cadl";
+import "@azure-tools/typespec-client-generator-core";
+import "./main.tsp";
-using Azure.DPG;
+using Azure.ClientGenerator.Core;
@@convenientAPI(AnomalyDetector.Multivariate.GetMultivariateBatchDetectionResult, true)
@@convenientAPI(AnomalyDetector.Multivariate.TrainMultivariateModel, true)
diff --git a/samples/AnomalyDetector/main.cadl b/samples/AnomalyDetector/main.tsp
similarity index 93%
rename from samples/AnomalyDetector/main.cadl
rename to samples/AnomalyDetector/main.tsp
index 7e2a22c1ae8..b7d84358358 100644
--- a/samples/AnomalyDetector/main.cadl
+++ b/samples/AnomalyDetector/main.tsp
@@ -1,11 +1,12 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "./univariate/routes.cadl";
-import "./multivariate/routes.cadl";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "./univariate/routes.tsp";
+import "./multivariate/routes.tsp";
-using Cadl.Rest;
-using Cadl.Http;
-using Cadl.Versioning;
+using TypeSpec.Rest;
+using TypeSpec.Http;
+using TypeSpec.Versioning;
@versioned(Versions)
@service({title: "Anomaly Detector"})
diff --git a/samples/AnomalyDetector/multivariate/models.cadl b/samples/AnomalyDetector/multivariate/models.tsp
similarity index 98%
rename from samples/AnomalyDetector/multivariate/models.cadl
rename to samples/AnomalyDetector/multivariate/models.tsp
index 939d8252026..e98e988ffd7 100644
--- a/samples/AnomalyDetector/multivariate/models.cadl
+++ b/samples/AnomalyDetector/multivariate/models.tsp
@@ -1,8 +1,9 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Cadl.Rest;
+using TypeSpec.Http;
+using TypeSpec.Rest;
using Azure.Core;
namespace AnomalyDetector.Multivariate;
diff --git a/samples/AnomalyDetector/multivariate/routes.cadl b/samples/AnomalyDetector/multivariate/routes.tsp
similarity index 96%
rename from samples/AnomalyDetector/multivariate/routes.cadl
rename to samples/AnomalyDetector/multivariate/routes.tsp
index d1c3eea9821..5438a214e7a 100644
--- a/samples/AnomalyDetector/multivariate/routes.cadl
+++ b/samples/AnomalyDetector/multivariate/routes.tsp
@@ -1,9 +1,10 @@
-import "@azure-tools/cadl-azure-core";
-import "@cadl-lang/rest";
-import "./models.cadl";
+import "@azure-tools/typespec-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "./models.tsp";
-using Cadl.Rest;
-using Cadl.Http;
+using TypeSpec.Rest;
+using TypeSpec.Http;
namespace AnomalyDetector.Multivariate;
diff --git a/samples/AnomalyDetector/univariate/models.cadl b/samples/AnomalyDetector/univariate/models.tsp
similarity index 98%
rename from samples/AnomalyDetector/univariate/models.cadl
rename to samples/AnomalyDetector/univariate/models.tsp
index 4799554d155..adbf28c5d75 100644
--- a/samples/AnomalyDetector/univariate/models.cadl
+++ b/samples/AnomalyDetector/univariate/models.tsp
@@ -1,8 +1,9 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Cadl.Rest;
+using TypeSpec.Http;
+using TypeSpec.Rest;
using Azure.Core;
namespace AnomalyDetector.Univariate;
diff --git a/samples/AnomalyDetector/univariate/routes.cadl b/samples/AnomalyDetector/univariate/routes.tsp
similarity index 91%
rename from samples/AnomalyDetector/univariate/routes.cadl
rename to samples/AnomalyDetector/univariate/routes.tsp
index 2e03b30f6a0..78769d82a3c 100644
--- a/samples/AnomalyDetector/univariate/routes.cadl
+++ b/samples/AnomalyDetector/univariate/routes.tsp
@@ -1,9 +1,10 @@
-import "@azure-tools/cadl-azure-core";
-import "@cadl-lang/rest";
-import "./models.cadl";
+import "@azure-tools/typespec-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "./models.tsp";
-using Cadl.Rest;
-using Cadl.Http;
+using TypeSpec.Rest;
+using TypeSpec.Http;
namespace AnomalyDetector.Univariate;
diff --git a/src/AutoRest.CSharp/Properties/launchSettings.json b/src/AutoRest.CSharp/Properties/launchSettings.json
index bfca47f5d59..1295b0db241 100644
--- a/src/AutoRest.CSharp/Properties/launchSettings.json
+++ b/src/AutoRest.CSharp/Properties/launchSettings.json
@@ -32,17 +32,17 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ApiVersion\\Generated"
},
- "ApiVersion-Cadl": {
+ "ApiVersion-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ApiVersion-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ApiVersion-Typespec\\Generated"
},
"AppConfiguration": {
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\samples\\AppConfiguration\\Generated"
},
- "Authoring-Cadl": {
+ "Authoring-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Authoring-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Authoring-Typespec\\Generated"
},
"azure-parameter-grouping": {
"commandName": "Project",
@@ -164,49 +164,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\BodyAndPath-LowLevel\\Generated"
},
- "cadl-arrays/item-types": {
+ "ClientAndOperationGroup-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\arrays\\item-types\\Generated"
- },
- "cadl-authentication/api-key": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\api-key\\Generated"
- },
- "cadl-authentication/oauth2": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\oauth2\\Generated"
- },
- "cadl-authentication/union": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\union\\Generated"
- },
- "cadl-enums/extensible": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\enums\\extensible\\Generated"
- },
- "cadl-hello": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\hello\\Generated"
- },
- "cadl-models/property-optional": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\property-optional\\Generated"
- },
- "cadl-models/property-types": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\property-types\\Generated"
- },
- "cadl-models/usage": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\usage\\Generated"
- },
- "cadl-projection": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\projection\\Generated"
- },
- "ClientAndOperationGroup-Cadl": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ClientAndOperationGroup-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ClientAndOperationGroup-Typespec\\Generated"
},
"CognitiveSearch": {
"commandName": "Project",
@@ -220,9 +180,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\CollapseRequestCondition-LowLevel\\Generated"
},
- "CollectionFormat-Cadl": {
+ "CollectionFormat-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\CollectionFormat-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\CollectionFormat-Typespec\\Generated"
},
"constants": {
"commandName": "Project",
@@ -252,9 +212,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjectsLowLevel\\custom-baseUrl-paging\\Generated"
},
- "Customizations-Cadl": {
+ "Customizations-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Customizations-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Customizations-Typespec\\Generated"
},
"dpg-customization-LowLevel": {
"commandName": "Project",
@@ -284,9 +244,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ExtensionClientName\\Generated"
},
- "FirstTest-Cadl": {
+ "FirstTest-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\FirstTest-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\FirstTest-Typespec\\Generated"
},
"FlattenedParameters": {
"commandName": "Project",
@@ -340,9 +300,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjects\\lro\\Generated"
},
- "Lro-Basic-Cadl": {
+ "Lro-Basic-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Lro-Basic-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Lro-Basic-Typespec\\Generated"
},
"lro-LowLevel": {
"commandName": "Project",
@@ -360,9 +320,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjectsLowLevel\\media_types\\Generated"
},
- "MediaTypes-Cadl": {
+ "MediaTypes-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\MediaTypes-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\MediaTypes-Typespec\\Generated"
},
"MgmtCollectionParent": {
"commandName": "Project",
@@ -464,9 +424,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\MgmtSubscriptionNameParameter\\Generated"
},
- "MixAPIVersion-Cadl": {
+ "MixAPIVersion-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\MixAPIVersion-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\MixAPIVersion-Typespec\\Generated"
},
"model-flattening": {
"commandName": "Project",
@@ -476,9 +436,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ModelNamespace\\Generated"
},
- "Models-Cadl": {
+ "Models-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Models-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Models-Typespec\\Generated"
},
"ModelShapes": {
"commandName": "Project",
@@ -520,9 +480,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Pagination\\Generated"
},
- "Pagination-Cadl": {
+ "Pagination-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Pagination-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Pagination-Typespec\\Generated"
},
"PaginationParams-LowLevel": {
"commandName": "Project",
@@ -536,21 +496,21 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjectsLowLevel\\paging\\Generated"
},
- "Parameters-Cadl": {
- "commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Parameters-Cadl\\Generated"
- },
"Parameters-LowLevel": {
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Parameters-LowLevel\\Generated"
},
+ "Parameters-Typespec": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Parameters-Typespec\\Generated"
+ },
"ParameterSequence-LowLevel": {
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ParameterSequence-LowLevel\\Generated"
},
- "PetStore-Cadl": {
+ "PetStore-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\PetStore-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\PetStore-Typespec\\Generated"
},
"ProtocolMethodsInRestClient": {
"commandName": "Project",
@@ -564,9 +524,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\ReferenceTypes\\Generated"
},
- "RenameGetList-Cadl": {
+ "RenameGetList-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\RenameGetList-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\RenameGetList-Typespec\\Generated"
},
"required-optional": {
"commandName": "Project",
@@ -604,9 +564,9 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\SingleTopLevelClientWithoutOperations-LowLevel\\Generated"
},
- "Spread-Cadl": {
+ "Spread-Typespec": {
"commandName": "Project",
- "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Spread-Cadl\\Generated"
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\Spread-Typespec\\Generated"
},
"SubClients-LowLevel": {
"commandName": "Project",
@@ -636,6 +596,46 @@
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestProjects\\TypeSchemaMapping\\SomeFolder\\Generated"
},
+ "typespec-arrays/item-types": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\arrays\\item-types\\Generated"
+ },
+ "typespec-authentication/api-key": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\api-key\\Generated"
+ },
+ "typespec-authentication/oauth2": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\oauth2\\Generated"
+ },
+ "typespec-authentication/union": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\authentication\\union\\Generated"
+ },
+ "typespec-enums/extensible": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\enums\\extensible\\Generated"
+ },
+ "typespec-hello": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\hello\\Generated"
+ },
+ "typespec-models/property-optional": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\property-optional\\Generated"
+ },
+ "typespec-models/property-types": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\property-types\\Generated"
+ },
+ "typespec-models/usage": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\models\\usage\\Generated"
+ },
+ "typespec-projection": {
+ "commandName": "Project",
+ "commandLineArgs": "--standalone $(SolutionDir)\\test\\CadlRanchProjects\\projection\\Generated"
+ },
"url": {
"commandName": "Project",
"commandLineArgs": "--standalone $(SolutionDir)\\test\\TestServerProjects\\url\\Generated"
diff --git a/src/AutoRest.CSharp/build/CodeGeneration.targets b/src/AutoRest.CSharp/build/CodeGeneration.targets
index d4fd0c8b30a..47baf363b49 100644
--- a/src/AutoRest.CSharp/build/CodeGeneration.targets
+++ b/src/AutoRest.CSharp/build/CodeGeneration.targets
@@ -2,10 +2,10 @@
pwsh
- $(MSBuildProjectDirectory)/../../../../eng/common/scripts/Cadl-Project-Sync.ps1
- $(MSBuildProjectDirectory)/../../../../eng/common/scripts/Cadl-Project-Generate.ps1
+ $(MSBuildProjectDirectory)/../../../../eng/common/scripts/TypeSpec-Project-Sync.ps1
+ $(MSBuildProjectDirectory)/../../../../eng/common/scripts/TypeSpec-Project-Generate.ps1
<_DefaultInputName Condition="Exists('$(MSBuildProjectDirectory)/autorest.md')">$(MSBuildProjectDirectory)/autorest.md
- $(MSBuildProjectDirectory)/../cadl-location.yaml
+ $(MSBuildProjectDirectory)/../tsp-location.yaml
$(_DefaultInputName)
$(MSBuildProjectDirectory)/autorest.tests.md
$(MSBuildThisFileDirectory)../tools/autorest/entrypoints/app.js
@@ -17,10 +17,10 @@
-->
true
@@ -28,13 +28,13 @@
$(MSBuildThisFileDirectory)../content/Generator.Shared/
$(MSBuildThisFileDirectory)../content/Management.Shared/
- <_GenerateCode Condition="'$(AutoRestInput)' != '' OR '$(CadlInput)' != ''">true
+ <_GenerateCode Condition="'$(AutoRestInput)' != '' OR '$(TypeSpecInput)' != ''">true
true
<_AutoRestCommand>node $(AutoRestEntryPoint) --max-memory-size=8192 --skip-csproj --skip-upgrade-check --version=$(AutoRestCoreVersion) $(AutoRestInput) $(AutoRestAdditionalParameters) --use=$(MSBuildThisFileDirectory)../tools/net6.0/any/ --clear-output-folder=true --shared-source-folders="$(AzureCoreSharedCodeDirectory);$(AutoRestSharedCodeDirectory)"
<_AutoRestCommand Condition="'$(UseDefaultNamespaceAndOutputFolder)' == 'true'">$(_AutoRestCommand) --output-folder=$(MSBuildProjectDirectory)/Generated --namespace=$(RootNamespace)
-
+
@@ -47,13 +47,13 @@
-
+
-
-
-
+
+
+
diff --git a/src/CADL.Extension/Emitter.Csharp/.eslintrc.cjs b/src/CADL.Extension/Emitter.Csharp/.eslintrc.cjs
index 45f086cb1a8..d470f069925 100644
--- a/src/CADL.Extension/Emitter.Csharp/.eslintrc.cjs
+++ b/src/CADL.Extension/Emitter.Csharp/.eslintrc.cjs
@@ -1,7 +1,7 @@
require("@cadl-lang/eslint-config-cadl/patch/modern-module-resolution");
module.exports = {
- plugins: ["@cadl-lang/eslint-plugin"],
- extends: ["@cadl-lang/eslint-config-cadl", "plugin:@cadl-lang/eslint-plugin/recommended"],
+ plugins: ["@typespec/eslint-plugin-typespec"],
+ extends: ["@typespec/eslint-config-typespec", "plugin:@typespec/eslint-plugin-typespec/recommended"],
parserOptions: { tsconfigRootDir: __dirname },
};
diff --git a/src/CADL.Extension/Emitter.Csharp/package.json b/src/CADL.Extension/Emitter.Csharp/package.json
index 6cce15e2466..991c9f6ebf4 100644
--- a/src/CADL.Extension/Emitter.Csharp/package.json
+++ b/src/CADL.Extension/Emitter.Csharp/package.json
@@ -1,10 +1,10 @@
{
- "name": "@azure-tools/cadl-csharp",
- "version": "0.1.11",
+ "name": "@azure-tools/typespec-csharp",
+ "version": "0.2.0",
"author": "Microsoft Corporation",
"description": "Cadl library for emitting csharp model from the Cadl REST protocol binding",
- "homepage": "https://github.com/Microsoft/cadl",
- "readme": "https://github.com/Microsoft/cadl/blob/master/README.md",
+ "homepage": "https://github.com/Microsoft/typespec",
+ "readme": "https://github.com/Microsoft/typespec/blob/master/README.md",
"license": "MIT",
"repository": {
"type": "git",
@@ -49,17 +49,18 @@
"typescript": "~4.9.4"
},
"dependencies": {
- "@autorest/csharp": "3.0.0-beta.20221201.1",
- "@azure-tools/cadl-autorest": "0.26.0",
- "@azure-tools/cadl-azure-core": "0.26.0",
- "@azure-tools/cadl-dpg": "0.26.0",
- "@cadl-lang/compiler": "0.40.0",
- "@cadl-lang/eslint-config-cadl": "0.5.0",
- "@cadl-lang/eslint-plugin": "0.40.0",
- "@cadl-lang/library-linter": "0.40.0",
- "@cadl-lang/openapi": "0.40.0",
- "@cadl-lang/rest": "0.40.0",
- "@cadl-lang/versioning": "0.40.0",
+ "@autorest/csharp": "3.0.0-beta.20230309.1",
+ "@azure-tools/typespec-autorest": "0.27.0",
+ "@azure-tools/typespec-azure-core": "0.27.0",
+ "@azure-tools/typespec-client-generator-core": "0.27.0",
+ "@typespec/compiler": "0.41.0",
+ "@typespec/eslint-config-typespec": "0.6.0",
+ "@typespec/eslint-plugin": "0.41.0",
+ "@typespec/http": "0.41.0",
+ "@typespec/library-linter": "0.41.0",
+ "@typespec/openapi": "0.41.0",
+ "@typespec/rest": "0.41.0",
+ "@typespec/versioning": "0.41.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/samples/CadlFirstTest/CadlFirstTest.cadl b/src/CADL.Extension/Emitter.Csharp/samples/CadlFirstTest/CadlFirstTest.tsp
similarity index 92%
rename from src/CADL.Extension/Emitter.Csharp/samples/CadlFirstTest/CadlFirstTest.cadl
rename to src/CADL.Extension/Emitter.Csharp/samples/CadlFirstTest/CadlFirstTest.tsp
index 3f352e67956..b94e82622ea 100644
--- a/src/CADL.Extension/Emitter.Csharp/samples/CadlFirstTest/CadlFirstTest.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/samples/CadlFirstTest/CadlFirstTest.tsp
@@ -1,5 +1,6 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-azure-core";
@service(
{
@@ -9,7 +10,7 @@ import "@azure-tools/cadl-azure-core";
)
namespace Demo.HelloWorld;
-using Cadl.Http;
+using TypeSpec.Http;
using Azure.Core;
@doc("Simple enum")
diff --git a/src/CADL.Extension/Emitter.Csharp/samples/petStore/decorators.js b/src/CADL.Extension/Emitter.Csharp/samples/petStore/decorators.js
index 192e2f7320a..4d36b4e08b0 100644
--- a/src/CADL.Extension/Emitter.Csharp/samples/petStore/decorators.js
+++ b/src/CADL.Extension/Emitter.Csharp/samples/petStore/decorators.js
@@ -1,5 +1,5 @@
// pretend I just typed this file from scratch... and saved it
-import { $doc } from "@cadl-lang/compiler";
+import { $doc } from "@typespec/compiler";
export function $fancyDoc(program, target, text) {
text = ``;
diff --git a/src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.cadl b/src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.tsp
similarity index 95%
rename from src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.cadl
rename to src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.tsp
index 0177bed7abe..87cdfc76839 100644
--- a/src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/samples/petStore/petStore.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
import "./decorators.js";
-using Cadl.Http;
+using TypeSpec.Http;
@service(
{
diff --git a/src/CADL.Extension/Emitter.Csharp/src/emitter.ts b/src/CADL.Extension/Emitter.Csharp/src/emitter.ts
index 048bd122658..c46be748bf8 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/emitter.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/emitter.ts
@@ -5,15 +5,15 @@ import {
createCadlLibrary,
Program,
resolvePath,
- Service
-} from "@cadl-lang/compiler";
+ Service,
+ EmitContext
+} from "@typespec/compiler";
import { stringifyRefs, PreserveType } from "json-serialize-refs";
import fs from "fs";
import path from "node:path";
import { Configuration } from "./type/configuration.js";
import { execSync } from "child_process";
-import { EmitContext } from "@cadl-lang/compiler";
import {
NetEmitterOptions,
NetEmitterOptionsSchema,
@@ -25,7 +25,7 @@ import { logger, LoggerLevel } from "./lib/logger.js";
import { cadlOutputFileName, configurationFileName } from "./constants.js";
export const $lib = createCadlLibrary({
- name: "cadl-csharp",
+ name: "typespec-csharp",
diagnostics: {},
emitter: {
options: NetEmitterOptionsSchema
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/cadlServer.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/cadlServer.ts
index 2df50bc4608..d2b53f5dfcf 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/cadlServer.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/cadlServer.ts
@@ -1,8 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { getDoc, Program, Type } from "@cadl-lang/compiler";
-import { http } from "@cadl-lang/rest";
+import { getDoc, Program, Type } from "@typespec/compiler";
+import { HttpServer } from "@typespec/http";
import { InputConstant } from "../type/inputConstant.js";
import { InputOperationParameterKind } from "../type/inputOperationParameterKind.js";
import { InputParameter } from "../type/inputParameter.js";
@@ -39,7 +39,7 @@ function getDefaultValue(type: Type): any {
export function resolveServers(
program: Program,
- servers: http.HttpServer[],
+ servers: HttpServer[],
models: Map,
enums: Map
): CadlServer[] {
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/clientModelBuilder.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/clientModelBuilder.ts
index 1e6f3e05709..abd03b45165 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/clientModelBuilder.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/clientModelBuilder.ts
@@ -8,7 +8,7 @@ import {
listOperationGroups,
listOperationsInOperationGroup,
OperationGroup
-} from "@azure-tools/cadl-dpg";
+} from "@azure-tools/typespec-client-generator-core";
import {
EmitContext,
listServices,
@@ -18,15 +18,15 @@ import {
Operation,
ignoreDiagnostics,
Program
-} from "@cadl-lang/compiler";
+} from "@typespec/compiler";
import {
getAuthentication,
getServers,
HttpOperation,
getAllHttpServices,
getHttpOperation
-} from "@cadl-lang/rest/http";
-import { getVersions } from "@cadl-lang/versioning";
+} from "@typespec/http";
+import { getVersions } from "@typespec/versioning";
import { NetEmitterOptions } from "../options.js";
import { CodeModel } from "../type/codeModel.js";
import { InputConstant } from "../type/inputConstant.js";
@@ -46,7 +46,7 @@ import { resolveServers } from "./cadlServer.js";
import { InputClient } from "../type/inputClient.js";
import { ClientKind } from "../type/clientKind.js";
import { InputOperation } from "../type/inputOperation.js";
-import { getOperationLink } from "@azure-tools/cadl-azure-core";
+import { getOperationLink } from "@azure-tools/typespec-azure-core";
import { getUsages } from "./model.js";
import { Usage } from "../type/usage.js";
import { loadOperation } from "./operation.js";
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/decorators.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/decorators.ts
index 7be6595e2c4..58751606bc6 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/decorators.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/decorators.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { DecoratedType, Operation, Program, Type } from "@cadl-lang/compiler";
+import { DecoratedType, Operation, Program, Type } from "@typespec/compiler";
import { ExternalDocs } from "../type/externalDocs.js";
const externalDocsKey = Symbol("externalDocs");
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts
index 906f6120931..25f4748f42f 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/model.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { isFixed } from "@azure-tools/cadl-azure-core";
+import { isFixed } from "@azure-tools/typespec-azure-core";
import {
Enum,
EnumMember,
@@ -29,15 +29,15 @@ import {
Scalar,
Union,
getProjectedNames
-} from "@cadl-lang/compiler";
-import { getResourceOperation } from "@cadl-lang/rest";
+} from "@typespec/compiler";
+import { getResourceOperation } from "@typespec/rest";
import {
getHeaderFieldName,
getPathParamName,
getQueryParamName,
HttpOperation,
isStatusCode
-} from "@cadl-lang/rest/http";
+} from "@typespec/http";
import {
projectedNameClientKey,
projectedNameCSharpKey,
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/operation.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/operation.ts
index 09bcab33cc4..1bdcd6d21fe 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/operation.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/operation.ts
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { getOperationLink } from "@azure-tools/cadl-azure-core";
+import { getOperationLink } from "@azure-tools/typespec-azure-core";
import {
createDpgContext,
isApiVersion,
shouldGenerateConvenient,
shouldGenerateProtocol
-} from "@azure-tools/cadl-dpg";
+} from "@azure-tools/typespec-client-generator-core";
import {
EmitContext,
getDeprecated,
@@ -19,13 +19,13 @@ import {
Namespace,
Operation,
Program
-} from "@cadl-lang/compiler";
-import { getResourceOperation, ResourceOperation } from "@cadl-lang/rest";
+} from "@typespec/compiler";
+import { getResourceOperation, ResourceOperation } from "@typespec/rest";
import {
HttpOperation,
HttpOperationParameter,
HttpOperationResponse
-} from "@cadl-lang/rest/http";
+} from "@typespec/http";
import { NetEmitterOptions } from "../options.js";
import { BodyMediaType, typeToBodyMediaType } from "../type/bodyMediaType.js";
import { collectionFormatToDelimMap } from "../type/collectionFormat.js";
diff --git a/src/CADL.Extension/Emitter.Csharp/src/lib/serviceAuthentication.ts b/src/CADL.Extension/Emitter.Csharp/src/lib/serviceAuthentication.ts
index 76618bcd0af..d07638f32ab 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/lib/serviceAuthentication.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/lib/serviceAuthentication.ts
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { ServiceAuthentication } from "@cadl-lang/rest/http";
+import { ServiceAuthentication } from "@typespec/http";
import { InputApiKeyAuth } from "../type/inputApiKeyAuth.js";
import { InputAuth } from "../type/inputAuth.js";
import { InputOAuth2Auth } from "../type/inputOAuth2Auth.js";
diff --git a/src/CADL.Extension/Emitter.Csharp/src/options.ts b/src/CADL.Extension/Emitter.Csharp/src/options.ts
index 2205e5255e3..2d16e630d57 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/options.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/options.ts
@@ -1,5 +1,5 @@
-import { DpgEmitterOptions } from "@azure-tools/cadl-dpg";
-import { EmitContext, JSONSchemaType, resolvePath } from "@cadl-lang/compiler";
+import { DpgEmitterOptions } from "@azure-tools/typespec-client-generator-core";
+import { EmitContext, JSONSchemaType, resolvePath } from "@typespec/compiler";
import { dllFilePath } from "@autorest/csharp";
import { LoggerLevel } from "./lib/logger.js";
diff --git a/src/CADL.Extension/Emitter.Csharp/src/type/bodyMediaType.ts b/src/CADL.Extension/Emitter.Csharp/src/type/bodyMediaType.ts
index 9a56a5a9235..a9e8c85cb62 100644
--- a/src/CADL.Extension/Emitter.Csharp/src/type/bodyMediaType.ts
+++ b/src/CADL.Extension/Emitter.Csharp/src/type/bodyMediaType.ts
@@ -1,6 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License. See License.txt in the project root for license information.
-import { Type } from "@cadl-lang/compiler";
+import { Type } from "@typespec/compiler";
export enum BodyMediaType {
None = "None",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/Configuration.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/Configuration.json
index 7590cad0f4e..ef74ab9d28e 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/Configuration.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/Configuration.json
@@ -1,6 +1,6 @@
{
"OutputFolder": ".",
- "Namespace": "Cadl.TestServer.ArrayBasic",
+ "Namespace": "TypeSpec.TestServer.ArrayBasic",
"LibraryName": null,
"SharedSourceFolders": [
"../../../../../../../node_modules/@autorest/csharp/Generator.Shared",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/cadl.json
index 7afdf509b90..4d4c9a94379 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/cadl.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/Generated/cadl.json
@@ -1,6 +1,6 @@
{
"$id": "1",
- "Name": "Cadl.TestServer.ArrayBasic",
+ "Name": "TypeSpec.TestServer.ArrayBasic",
"Description": "Illustrates input, output, and round-trip models with required enum type properties.",
"ApiVersions": [
"1.0.0"
@@ -10,7 +10,7 @@
{
"$id": "2",
"Name": "Pet",
- "Namespace": "Cadl.TestServer.ArrayBasic",
+ "Namespace": "TypeSpec.TestServer.ArrayBasic",
"IsNullable": false,
"Usage": "Output",
"Properties": [
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.tsp
similarity index 83%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.tsp
index 4d11cd1242f..aec828f409c 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/array/array.tsp
@@ -1,6 +1,7 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
-using Cadl.Http;
+using TypeSpec.Http;
@service(
{
@@ -11,7 +12,7 @@ using Cadl.Http;
@server("http://localhost:3000", "TestServer endpoint")
@doc("Illustrates input, output, and round-trip models with required enum type properties.")
-namespace Cadl.TestServer.ArrayBasic;
+namespace TypeSpec.TestServer.ArrayBasic;
// Model types
model Pet {
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.tsp
similarity index 87%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.tsp
index 18cd84996e3..7eb3770b8da 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/client/client.tsp
@@ -1,5 +1,6 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-client-generator-core";
@service(
{
@@ -16,8 +17,8 @@ import "@azure-tools/cadl-dpg";
)
namespace Azure.ClientService;
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
enum Clients { ServiceClient };
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.tsp
similarity index 82%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.tsp
index 015bfb9e9d1..4ea99868aa4 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpoint/endpoint.tsp
@@ -1,4 +1,5 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
@service(
{
@@ -15,7 +16,7 @@ import "@cadl-lang/rest";
)
namespace endpoint;
-using Cadl.Http;
+using TypeSpec.Http;
@route("/endpoint")
@doc("Path parameter is string with format")
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.tsp
similarity index 83%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.tsp
index b4c46203de8..c88d48c83a2 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/endpointWithMultiplePart/endpointWithMultiplePart.tsp
@@ -1,4 +1,5 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
@service(
{
@@ -16,7 +17,7 @@ import "@cadl-lang/rest";
)
namespace endpoint;
-using Cadl.Http;
+using TypeSpec.Http;
@route("/endpoint")
@doc("Path parameter is string with format")
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/Configuration.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/Configuration.json
index f1ccf6919e2..a1536117838 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/Configuration.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/Configuration.json
@@ -1,6 +1,6 @@
{
"OutputFolder": ".",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"LibraryName": null,
"SharedSourceFolders": [
"../../../../../../../node_modules/@autorest/csharp/Generator.Shared",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/cadl.json
index 463e17abf5c..cd9917fee18 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/cadl.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/Generated/cadl.json
@@ -1,6 +1,6 @@
{
"$id": "1",
- "Name": "Cadl.EnumPropertiesBasic",
+ "Name": "TypeSpec.EnumPropertiesBasic",
"Description": "Illustrates input models with required enum type properties.",
"ApiVersions": [
"1.0.0"
@@ -9,7 +9,7 @@
{
"$id": "2",
"Name": "DayOfTheWeek",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"Description": "Represents the days of the week using a standard, non-string enum.",
"EnumValueType": "String",
"AllowedValues": [
@@ -57,7 +57,7 @@
{
"$id": "10",
"Name": "FixedDayOfTheWeek",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"Description": "Represents the days of the week using a standard, non-string enum.",
"EnumValueType": "String",
"AllowedValues": [
@@ -105,7 +105,7 @@
{
"$id": "18",
"Name": "TranslationLanguage",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"Description": "The language to translate the input text into.",
"EnumValueType": "String",
"AllowedValues": [
@@ -140,7 +140,7 @@
{
"$id": "23",
"Name": "EnumWithStringValue",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"Description": "Represents the simple enum with enum string value.",
"EnumValueType": "String",
"AllowedValues": [
@@ -169,7 +169,7 @@
{
"$id": "27",
"Name": "InputModel",
- "Namespace": "Cadl.EnumPropertiesBasic",
+ "Namespace": "TypeSpec.EnumPropertiesBasic",
"Description": "Input model with enum properties.",
"IsNullable": false,
"Usage": "Input",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.tsp
similarity index 94%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.tsp
index af59cc3ce07..9c91aac43c7 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/enum/enum.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
+using TypeSpec.Http;
using Azure.Core;
@service(
@@ -13,7 +14,7 @@ using Azure.Core;
@server("http://localhost:3000", "TestServer endpoint")
@doc("Illustrates input models with required enum type properties.")
-namespace Cadl.EnumPropertiesBasic;
+namespace TypeSpec.EnumPropertiesBasic;
@doc("The language to translate the input text into.")
@knownValues(TranslationLanguageValues)
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/Configuration.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/Configuration.json
index 84d1201a9b4..2a6c294d94e 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/Configuration.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/Configuration.json
@@ -1,6 +1,6 @@
{
"OutputFolder": ".",
- "Namespace": "Cadl.HeadClient",
+ "Namespace": "TypeSpec.HeadClient",
"LibraryName": null,
"SharedSourceFolders": [
"../../../../../../../node_modules/@autorest/csharp/Generator.Shared",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/cadl.json
index cbf4424f853..7c47b0a191a 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/cadl.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/Generated/cadl.json
@@ -1,6 +1,6 @@
{
"$id": "1",
- "Name": "Cadl.HeadClient",
+ "Name": "TypeSpec.HeadClient",
"Description": "Illustrates clients generated from a Cadl with head parameter.",
"ApiVersions": [
"1.0.0"
@@ -10,7 +10,7 @@
{
"$id": "2",
"Name": "Thing",
- "Namespace": "Cadl.HeadClient",
+ "Namespace": "TypeSpec.HeadClient",
"IsNullable": false,
"Usage": "Input",
"Properties": [
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.tsp
similarity index 82%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.tsp
index 77ea5769bc0..86fdc52b2c1 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/head/head.tsp
@@ -1,6 +1,7 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
-using Cadl.Http;
+using TypeSpec.Http;
@service(
{
@@ -10,7 +11,7 @@ using Cadl.Http;
)
@server("http://localhost:3000", "TestServer endpoint")
@doc("Illustrates clients generated from a Cadl with head parameter.")
-namespace Cadl.HeadClient;
+namespace TypeSpec.HeadClient;
model Thing {
@doc("name of the Thing")
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/Configuration.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/Configuration.json
index 2efaf7400f2..a31ee2f2cdc 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/Configuration.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/Configuration.json
@@ -1,6 +1,6 @@
{
"OutputFolder": ".",
- "Namespace": "Cadl.TestServer.MultiInterfaceClient",
+ "Namespace": "TypeSpec.TestServer.MultiInterfaceClient",
"LibraryName": null,
"SharedSourceFolders": [
"../../../../../../../node_modules/@autorest/csharp/Generator.Shared",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/cadl.json
index e1b0dd26057..20333b7e4b2 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/cadl.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/Generated/cadl.json
@@ -1,6 +1,6 @@
{
"$id": "1",
- "Name": "Cadl.TestServer.MultiInterfaceClient",
+ "Name": "TypeSpec.TestServer.MultiInterfaceClient",
"Description": "Illustrates clients generated from a Cadl with multiple interfaces.",
"ApiVersions": [
"1.0.0"
@@ -10,7 +10,7 @@
{
"$id": "2",
"Name": "Dog",
- "Namespace": "Cadl.TestServer.MultiInterfaceClient",
+ "Namespace": "TypeSpec.TestServer.MultiInterfaceClient",
"Description": "Simple model.",
"IsNullable": false,
"Usage": "RoundTrip",
@@ -35,7 +35,7 @@
{
"$id": "5",
"Name": "Cat",
- "Namespace": "Cadl.TestServer.MultiInterfaceClient",
+ "Namespace": "TypeSpec.TestServer.MultiInterfaceClient",
"Description": "Simple model.",
"IsNullable": false,
"Usage": "RoundTrip",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.tsp
similarity index 77%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.tsp
index cb6e426066b..2b4de4f95fa 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/interface/interface.tsp
@@ -1,9 +1,10 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
@service(
{
@@ -13,7 +14,7 @@ using Azure.DPG;
)
@server("http://localhost:3000", "TestServer endpoint")
@doc("Illustrates clients generated from a Cadl with multiple interfaces.")
-namespace Cadl.TestServer.MultiInterfaceClient;
+namespace TypeSpec.TestServer.MultiInterfaceClient;
@doc("Simple model.")
model Dog {
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.tsp
similarity index 80%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.tsp
index be4b7ecb111..aec5ddded9c 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/lro/lro.tsp
@@ -1,10 +1,11 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
-
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
// NOTE: These features are missing:
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/main.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/main.cadl
index 17684b36379..4c756fee3b1 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/main.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/main.cadl
@@ -1,5 +1,6 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-client-generator-core";
@service(
{
@@ -16,8 +17,8 @@ import "@azure-tools/cadl-dpg";
)
namespace Azure.OperationGroupService;
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
enum Clients { ServiceClient };
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.cadl
deleted file mode 100644
index 7bf7bf9dd71..00000000000
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.cadl
+++ /dev/null
@@ -1,3 +0,0 @@
-import "./main.cadl";
-import "@azure-tools/cadl-dpg";
-using Azure.DPG;
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.tsp b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.tsp
new file mode 100644
index 00000000000..d78fd35c843
--- /dev/null
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/operationGroup/operationGroup.tsp
@@ -0,0 +1,3 @@
+import "./main.cadl";
+import "@azure-tools/typespec-client-generator-core";
+using Azure.ClientGenerator.Core;
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.tsp
similarity index 86%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.tsp
index 3c9e82ad027..cc904bf6bea 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/pagination/pagination.tsp
@@ -1,12 +1,12 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
-import "@azure-tools/cadl-autorest";
-import "@cadl-lang/openapi";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@typespec/openapi";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
using OpenAPI;
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.tsp
similarity index 91%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.tsp
index 72ee8ee41a6..8416bed303e 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/polymorphism/polymorphism.tsp
@@ -1,10 +1,11 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
// NOTE: These features are missing:
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.tsp
similarity index 90%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.tsp
index 22c3cded650..13f0a090cf6 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/security/security.tsp
@@ -1,6 +1,7 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
-using Cadl.Http;
+using TypeSpec.Http;
@service(
{
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.tsp
similarity index 86%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.tsp
index 4170c7b0639..b1424ee53e8 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/string-format/string-format.tsp
@@ -1,4 +1,5 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
@service(
{
@@ -8,7 +9,7 @@ import "@cadl-lang/rest";
)
namespace stringFormat;
-using Cadl.Http;
+using TypeSpec.Http;
@route("/zonedDateTime")
@doc("Path parameter is string with zonedDateTime format")
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/Configuration.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/Configuration.json
index dc6836b593c..97dd1216f81 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/Configuration.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/Configuration.json
@@ -1,6 +1,6 @@
{
"OutputFolder": ".",
- "Namespace": "Cadl.visibility",
+ "Namespace": "TypeSpec.visibility",
"LibraryName": null,
"SharedSourceFolders": [
"../../../../../../../node_modules/@autorest/csharp/Generator.Shared",
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/cadl.json b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/cadl.json
index 596033a7fbd..6b89526bb96 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/cadl.json
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/Generated/cadl.json
@@ -1,6 +1,6 @@
{
"$id": "1",
- "Name": "Cadl.visibility",
+ "Name": "TypeSpec.visibility",
"Description": "Illustrates read, write and read/write properties.",
"ApiVersions": [
"1.0.0"
@@ -10,7 +10,7 @@
{
"$id": "2",
"Name": "Dog",
- "Namespace": "Cadl.visibility",
+ "Namespace": "TypeSpec.visibility",
"IsNullable": false,
"Usage": "Input",
"Properties": [
diff --git a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.cadl b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.tsp
similarity index 88%
rename from src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.cadl
rename to src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.tsp
index e8c2fa7c871..afc24bf216d 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.cadl
+++ b/src/CADL.Extension/Emitter.Csharp/test/TestProjects/visibility/visibility.tsp
@@ -1,6 +1,7 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
+import "@typespec/http";
-using Cadl.Http;
+using TypeSpec.Http;
@service(
{
@@ -11,7 +12,7 @@ using Cadl.Http;
@server("http://localhost:3000", "TestServer endpoint")
@doc("Illustrates read, write and read/write properties.")
-namespace Cadl.visibility;
+namespace TypeSpec.visibility;
model Dog {
// the service will generate an ID, so you dont need to send it.
diff --git a/src/CADL.Extension/Emitter.Csharp/test/Unit/propertyType.test.ts b/src/CADL.Extension/Emitter.Csharp/test/Unit/propertyType.test.ts
index 57b44910250..e77928f0a6f 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/Unit/propertyType.test.ts
+++ b/src/CADL.Extension/Emitter.Csharp/test/Unit/propertyType.test.ts
@@ -1,9 +1,9 @@
-import { TestHost } from "@cadl-lang/compiler/testing";
+import { TestHost } from "@typespec/compiler/testing";
import assert, { AssertionError, deepStrictEqual } from "assert";
import { createModel } from "../../src/lib/clientModelBuilder.js";
import { CodeModel } from "../../src/type/codeModel.js";
import {
- cadlCompile,
+ typeSpecCompile,
createEmitterContext,
createEmitterTestHost
} from "./utils/TestUtil.js";
@@ -25,7 +25,7 @@ import {
navigateTypesInNamespace,
Program,
Type
-} from "@cadl-lang/compiler";
+} from "@typespec/compiler";
import { getInputType } from "../../src/lib/model.js";
describe("Test GetInputType for array", () => {
@@ -36,7 +36,7 @@ describe("Test GetInputType for array", () => {
});
it("array as request", async () => {
- const program = await cadlCompile(
+ const program = await typeSpecCompile(
`
op test(@body input: string[]): string[];
`,
@@ -66,7 +66,7 @@ describe("Test GetInputType for array", () => {
});
it("array as response", async () => {
- const program = await cadlCompile(
+ const program = await typeSpecCompile(
`
op test(): string[];
`,
@@ -103,9 +103,9 @@ describe("Test GetInputType for enum", () => {
});
it("Fixed string enum", async () => {
- const program = await cadlCompile(
+ const program = await typeSpecCompile(
`
- #suppress "@azure-tools/cadl-azure-core/use-extensible-enum" "Enums should be defined without the @fixed decorator."
+ #suppress "@azure-tools/typespec-azure-core/use-extensible-enum" "Enums should be defined without the @fixed decorator."
@doc("fixed string enum")
@fixed
enum SimpleEnum {
@@ -113,7 +113,7 @@ describe("Test GetInputType for enum", () => {
Two: "2",
Four: "4"
}
- #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "Operation 'test' should be defined using a signature from the Azure.Core namespace."
+ #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Operation 'test' should be defined using a signature from the Azure.Core namespace."
@doc("test fixed enum.")
op test(@doc("fixed enum as input.")@body input: SimpleEnum): string[];
`,
@@ -151,9 +151,9 @@ describe("Test GetInputType for enum", () => {
deepStrictEqual(type.IsExtensible, false);
});
it("Fixed int enum", async () => {
- const program = await cadlCompile(
+ const program = await typeSpecCompile(
`
- #suppress "@azure-tools/cadl-azure-core/use-extensible-enum" "Enums should be defined without the @fixed decorator."
+ #suppress "@azure-tools/typespec-azure-core/use-extensible-enum" "Enums should be defined without the @fixed decorator."
@doc("Fixed int enum")
@fixed
enum FixedIntEnum {
@@ -161,7 +161,7 @@ describe("Test GetInputType for enum", () => {
Two: 2,
Four: 4
}
- #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "Operation 'test' should be defined using a signature from the Azure.Core namespace."
+ #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "Operation 'test' should be defined using a signature from the Azure.Core namespace."
@doc("test fixed enum.")
op test(@doc("fixed enum as input.")@body input: FixedIntEnum): string[];
`,
@@ -200,7 +200,7 @@ describe("Test GetInputType for enum", () => {
});
it("extensible enum", async () => {
- const program = await cadlCompile(
+ const program = await typeSpecCompile(
`
@doc("Extensible enum")
enum ExtensibleEnum {
diff --git a/src/CADL.Extension/Emitter.Csharp/test/Unit/utils/TestUtil.ts b/src/CADL.Extension/Emitter.Csharp/test/Unit/utils/TestUtil.ts
index 05d2667e027..1bb6d2a098f 100644
--- a/src/CADL.Extension/Emitter.Csharp/test/Unit/utils/TestUtil.ts
+++ b/src/CADL.Extension/Emitter.Csharp/test/Unit/utils/TestUtil.ts
@@ -1,21 +1,23 @@
-import { createTestHost, TestHost } from "@cadl-lang/compiler/testing";
-import { RestTestLibrary } from "@cadl-lang/rest/testing";
-import { VersioningTestLibrary } from "@cadl-lang/versioning/testing";
-import { AzureCoreTestLibrary } from "@azure-tools/cadl-azure-core/testing";
-import { EmitContext, Program } from "@cadl-lang/compiler";
+import { createTestHost, TestHost } from "@typespec/compiler/testing";
+import { RestTestLibrary } from "@typespec/rest/testing";
+import { HttpTestLibrary } from "@typespec/http/testing";
+import { VersioningTestLibrary } from "@typespec/versioning/testing";
+import { AzureCoreTestLibrary } from "@azure-tools/typespec-azure-core/testing";
+import { EmitContext, Program } from "@typespec/compiler";
import { NetEmitterOptions } from "../../../src/options";
export async function createEmitterTestHost(): Promise {
return createTestHost({
libraries: [
RestTestLibrary,
+ HttpTestLibrary,
VersioningTestLibrary,
AzureCoreTestLibrary
]
});
}
-export async function cadlCompile(
+export async function typeSpecCompile(
content: string,
host: TestHost,
needNamespaces: boolean = true,
@@ -28,15 +30,16 @@ export async function cadlCompile(
})
namespace Azure.Csharp.Testing;
`;
- host.addCadlFile(
- "main.cadl",
+ host.addTypeSpecFile(
+ "main.tsp",
`
- import "@cadl-lang/rest";
- import "@cadl-lang/versioning";
- ${needAzureCore ? 'import "@azure-tools/cadl-azure-core";' : ""}
- using Cadl.Rest;
- using Cadl.Http;
- using Cadl.Versioning;
+ import "@typespec/rest";
+ import "@typespec/http";
+ import "@typespec/versioning";
+ ${needAzureCore ? 'import "@azure-tools/typespec-azure-core";' : ""}
+ using TypeSpec.Rest;
+ using TypeSpec.Http;
+ using TypeSpec.Versioning;
${needAzureCore ? "using Azure.Core;" : ""}
${needNamespaces ? namespace : ""}
diff --git a/test/CadlRanchMockApis/package.json b/test/CadlRanchMockApis/package.json
index db224429db2..a1525914c9c 100644
--- a/test/CadlRanchMockApis/package.json
+++ b/test/CadlRanchMockApis/package.json
@@ -32,6 +32,6 @@
"dist/**"
],
"dependencies": {
- "@azure-tools/cadl-ranch-specs": "0.7.0"
+ "@azure-tools/cadl-ranch-specs": "0.9.0"
}
}
\ No newline at end of file
diff --git a/test/CadlRanchProjects.Tests/CadlRanchProjects.Tests.csproj b/test/CadlRanchProjects.Tests/CadlRanchProjects.Tests.csproj
index cb698115502..fc473d11150 100644
--- a/test/CadlRanchProjects.Tests/CadlRanchProjects.Tests.csproj
+++ b/test/CadlRanchProjects.Tests/CadlRanchProjects.Tests.csproj
@@ -33,7 +33,7 @@
-
+
diff --git a/test/CadlRanchProjects.Tests/LroBasic-Cadl.cs b/test/CadlRanchProjects.Tests/LroBasic-Typespec.cs
similarity index 100%
rename from test/CadlRanchProjects.Tests/LroBasic-Cadl.cs
rename to test/CadlRanchProjects.Tests/LroBasic-Typespec.cs
diff --git a/test/CadlRanchProjects.Tests/Models-Cadl.cs b/test/CadlRanchProjects.Tests/Models-Typespec.cs
similarity index 100%
rename from test/CadlRanchProjects.Tests/Models-Cadl.cs
rename to test/CadlRanchProjects.Tests/Models-Typespec.cs
diff --git a/test/CadlRanchProjects.Tests/PetStore-Cadl.cs b/test/CadlRanchProjects.Tests/PetStore-Typespec.cs
similarity index 100%
rename from test/CadlRanchProjects.Tests/PetStore-Cadl.cs
rename to test/CadlRanchProjects.Tests/PetStore-Typespec.cs
diff --git a/test/CadlRanchProjects.Tests/Spread-Cadl.cs b/test/CadlRanchProjects.Tests/Spread-Typespec.cs
similarity index 100%
rename from test/CadlRanchProjects.Tests/Spread-Cadl.cs
rename to test/CadlRanchProjects.Tests/Spread-Typespec.cs
diff --git a/test/CadlRanchProjects/inheritance/inheritance-cadl.cadl b/test/CadlRanchProjects/inheritance/inheritance-typespec.tsp
similarity index 97%
rename from test/CadlRanchProjects/inheritance/inheritance-cadl.cadl
rename to test/CadlRanchProjects/inheritance/inheritance-typespec.tsp
index 317374c7b83..d6e8537857b 100644
--- a/test/CadlRanchProjects/inheritance/inheritance-cadl.cadl
+++ b/test/CadlRanchProjects/inheritance/inheritance-typespec.tsp
@@ -1,10 +1,11 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@azure-tools/typespec-client-generator-core";
import "@azure-tools/cadl-ranch-expect";
-using Cadl.Rest;
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Rest;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
@doc("Illustrates inheritance and polymorphic model.")
@service({
diff --git a/test/CadlRanchProjects/models/property-optional/cadl-project.yaml b/test/CadlRanchProjects/models/property-optional/tspconfig.yaml
similarity index 82%
rename from test/CadlRanchProjects/models/property-optional/cadl-project.yaml
rename to test/CadlRanchProjects/models/property-optional/tspconfig.yaml
index c56f67904a1..27bd290011c 100644
--- a/test/CadlRanchProjects/models/property-optional/cadl-project.yaml
+++ b/test/CadlRanchProjects/models/property-optional/tspconfig.yaml
@@ -1,4 +1,4 @@
options:
- "@azure-tools/cadl-csharp":
+ "@azure-tools/typespec-csharp":
models-to-treat-empty-string-as-null: [DurationProperty, DatetimeProperty]
additional-intrinsic-types-to-treat-empty-string-as-null: [TimeSpan]
diff --git a/test/TestProjects/ApiVersion-Cadl/ApiVersion-Cadl.cadl b/test/TestProjects/ApiVersion-Typespec/ApiVersion-Typespec.tsp
similarity index 91%
rename from test/TestProjects/ApiVersion-Cadl/ApiVersion-Cadl.cadl
rename to test/TestProjects/ApiVersion-Typespec/ApiVersion-Typespec.tsp
index 52b84ea48e2..9b2c2d429ec 100644
--- a/test/TestProjects/ApiVersion-Cadl/ApiVersion-Cadl.cadl
+++ b/test/TestProjects/ApiVersion-Typespec/ApiVersion-Typespec.tsp
@@ -1,11 +1,13 @@
-import "@cadl-lang/rest";
-import "@azure-tools/cadl-dpg";
-import "@cadl-lang/versioning";
-using Cadl.Rest;
-using Cadl.Http;
-using Azure.DPG;
-using Cadl.Versioning;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@azure-tools/typespec-client-generator-core";
+
+using TypeSpec.Rest;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
+using TypeSpec.Versioning;
@versioned(Versions)
@service({title: "Anomaly Detector"})
diff --git a/test/TestProjects/ApiVersion-Cadl/ApiVersion.csproj b/test/TestProjects/ApiVersion-Typespec/ApiVersion.csproj
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/ApiVersion.csproj
rename to test/TestProjects/ApiVersion-Typespec/ApiVersion.csproj
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClient.cs b/test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClient.cs
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClient.cs
rename to test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClient.cs
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClientBuilderExtensions.cs b/test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClientBuilderExtensions.cs
rename to test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClientBuilderExtensions.cs
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClientOptions.cs b/test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClientOptions.cs
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/ApiVersionInCadlClientOptions.cs
rename to test/TestProjects/ApiVersion-Typespec/Generated/ApiVersionInCadlClientOptions.cs
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/Configuration.json b/test/TestProjects/ApiVersion-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/Configuration.json
rename to test/TestProjects/ApiVersion-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/Docs/ApiVersionInCadlClient.xml b/test/TestProjects/ApiVersion-Typespec/Generated/Docs/ApiVersionInCadlClient.xml
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/Docs/ApiVersionInCadlClient.xml
rename to test/TestProjects/ApiVersion-Typespec/Generated/Docs/ApiVersionInCadlClient.xml
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/Models/DetectionResult.Serialization.cs b/test/TestProjects/ApiVersion-Typespec/Generated/Models/DetectionResult.Serialization.cs
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/Models/DetectionResult.Serialization.cs
rename to test/TestProjects/ApiVersion-Typespec/Generated/Models/DetectionResult.Serialization.cs
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/Models/DetectionResult.cs b/test/TestProjects/ApiVersion-Typespec/Generated/Models/DetectionResult.cs
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/Models/DetectionResult.cs
rename to test/TestProjects/ApiVersion-Typespec/Generated/Models/DetectionResult.cs
diff --git a/test/TestProjects/ApiVersion-Cadl/Generated/cadl.json b/test/TestProjects/ApiVersion-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/ApiVersion-Cadl/Generated/cadl.json
rename to test/TestProjects/ApiVersion-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Authoring-Cadl/Authoring-Cadl.csproj b/test/TestProjects/Authoring-Typespec/Authoring-Typespec.csproj
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Authoring-Cadl.csproj
rename to test/TestProjects/Authoring-Typespec/Authoring-Typespec.csproj
diff --git a/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl b/test/TestProjects/Authoring-Typespec/Authoring-Typespec.tsp
similarity index 94%
rename from test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl
rename to test/TestProjects/Authoring-Typespec/Authoring-Typespec.tsp
index cb17809eed8..208c0cacd58 100644
--- a/test/TestProjects/Authoring-Cadl/Authoring-Cadl.cadl
+++ b/test/TestProjects/Authoring-Typespec/Authoring-Typespec.tsp
@@ -1,13 +1,14 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
-import "@azure-tools/cadl-dpg";
-
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
-using Azure.DPG;
+using Azure.ClientGenerator.Core;
// NOTE: These features are missing:
// - Security definition for apiKey
@@ -35,7 +36,6 @@ namespace Azure.Language.Authoring;
scalar Endpoint extends string;
// Models
-
model Project {
@key
@visibility("read")
@@ -245,7 +245,7 @@ interface Projects {
export is ResourceAction<
Project,
ExportParams,
- Cadl.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
+ TypeSpec.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
>;
// NOTE: `import` is a reserved keyword
@@ -253,7 +253,7 @@ interface Projects {
importx is ResourceAction<
Project,
ExportedProject,
- Cadl.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
+ TypeSpec.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
>;
@doc("Triggers a training job for a project.")
@@ -262,7 +262,7 @@ interface Projects {
{
@body body: TrainingJobOptions;
},
- Cadl.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
+ TypeSpec.Http.AcceptedResponse & Foundations.LongRunningStatusLocation
>;
}
diff --git a/test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs b/test/TestProjects/Authoring-Typespec/Generated/AuthoringClient.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/AuthoringClient.cs
rename to test/TestProjects/Authoring-Typespec/Generated/AuthoringClient.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/AuthoringClientOptions.cs b/test/TestProjects/Authoring-Typespec/Generated/AuthoringClientOptions.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/AuthoringClientOptions.cs
rename to test/TestProjects/Authoring-Typespec/Generated/AuthoringClientOptions.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/AzureLanguageAuthoringClientBuilderExtensions.cs b/test/TestProjects/Authoring-Typespec/Generated/AzureLanguageAuthoringClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/AzureLanguageAuthoringClientBuilderExtensions.cs
rename to test/TestProjects/Authoring-Typespec/Generated/AzureLanguageAuthoringClientBuilderExtensions.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Configuration.json b/test/TestProjects/Authoring-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Configuration.json
rename to test/TestProjects/Authoring-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml b/test/TestProjects/Authoring-Typespec/Generated/Docs/AuthoringClient.xml
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Docs/AuthoringClient.xml
rename to test/TestProjects/Authoring-Typespec/Generated/Docs/AuthoringClient.xml
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.Serialization.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/DeploymentJob.Serialization.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.Serialization.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/DeploymentJob.Serialization.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/DeploymentJob.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/DeploymentJob.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/DeploymentJob.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/JobStatus.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/JobStatus.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/JobStatus.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/JobStatus.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/JobWarning.Serialization.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/JobWarning.Serialization.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/JobWarning.Serialization.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/JobWarning.Serialization.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/JobWarning.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/JobWarning.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/JobWarning.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/JobWarning.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.Serialization.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/SwapDeploymentsJob.Serialization.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.Serialization.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/SwapDeploymentsJob.Serialization.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs b/test/TestProjects/Authoring-Typespec/Generated/Models/SwapDeploymentsJob.cs
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/Models/SwapDeploymentsJob.cs
rename to test/TestProjects/Authoring-Typespec/Generated/Models/SwapDeploymentsJob.cs
diff --git a/test/TestProjects/Authoring-Cadl/Generated/cadl.json b/test/TestProjects/Authoring-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Authoring-Cadl/Generated/cadl.json
rename to test/TestProjects/Authoring-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/ClientAndOperationGroup-Typespec/ClientAndOperationGroup-Typespec.tsp b/test/TestProjects/ClientAndOperationGroup-Typespec/ClientAndOperationGroup-Typespec.tsp
new file mode 100644
index 00000000000..f7873437125
--- /dev/null
+++ b/test/TestProjects/ClientAndOperationGroup-Typespec/ClientAndOperationGroup-Typespec.tsp
@@ -0,0 +1,53 @@
+import "@typespec/rest";
+import "@azure-tools/typespec-client-generator-core";
+
+@service(
+ {
+ title: "clientAndOperationGroupService",
+ version: "2015-06-18"
+ }
+)
+@server(
+ "{operationGroupServiceUrl}",
+ "OperationGroup Service",
+ {
+ operationGroupServiceUrl: string,
+ }
+)
+namespace Azure.ClientAndOperationGroupService;
+
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
+
+namespace Alpha {
+ #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
+ @route("/Alpha")
+ op one(): string;
+}
+
+@operationGroup
+namespace Beta {
+ #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
+ @route("/Beta")
+ op two(): string;
+
+ namespace SubBeta {
+ #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
+ @route("/SubBeta")
+ op three(): string;
+ }
+}
+
+@operationGroup
+namespace Gamma {
+ #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
+ @route("/Gamma")
+ op four(): string;
+
+ #suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
+ @route("/Gamma")
+ @put op five(): string;
+}
+
+@route("/top")
+op zero(): string;
\ No newline at end of file
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/ClientAndOperationGroup.csproj b/test/TestProjects/ClientAndOperationGroup-Typespec/ClientAndOperationGroup.csproj
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/ClientAndOperationGroup.csproj
rename to test/TestProjects/ClientAndOperationGroup-Typespec/ClientAndOperationGroup.csproj
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/AzureClientAndOperationGroupServiceClientBuilderExtensions.cs b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/AzureClientAndOperationGroupServiceClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/AzureClientAndOperationGroupServiceClientBuilderExtensions.cs
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/AzureClientAndOperationGroupServiceClientBuilderExtensions.cs
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Beta.cs b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Beta.cs
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Beta.cs
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Beta.cs
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/ClientAndOperationGroupServiceClient.cs b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/ClientAndOperationGroupServiceClient.cs
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/ClientAndOperationGroupServiceClient.cs
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/ClientAndOperationGroupServiceClient.cs
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/ClientAndOperationGroupServiceClientOptions.cs b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/ClientAndOperationGroupServiceClientOptions.cs
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/ClientAndOperationGroupServiceClientOptions.cs
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/ClientAndOperationGroupServiceClientOptions.cs
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Configuration.json b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Configuration.json
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/Beta.xml b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/Beta.xml
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/Beta.xml
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/Beta.xml
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/ClientAndOperationGroupServiceClient.xml b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/ClientAndOperationGroupServiceClient.xml
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/ClientAndOperationGroupServiceClient.xml
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/ClientAndOperationGroupServiceClient.xml
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/Gamma.xml b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/Gamma.xml
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Docs/Gamma.xml
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Docs/Gamma.xml
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Gamma.cs b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Gamma.cs
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/Gamma.cs
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/Gamma.cs
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/Generated/cadl.json b/test/TestProjects/ClientAndOperationGroup-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/Generated/cadl.json
rename to test/TestProjects/ClientAndOperationGroup-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/ClientAndOperationGroup-Cadl/ClientAndOperationGroup-Cadl.cadl b/test/TestProjects/ClientAndOperationGroup-Typespec/main.tsp
similarity index 92%
rename from test/TestProjects/ClientAndOperationGroup-Cadl/ClientAndOperationGroup-Cadl.cadl
rename to test/TestProjects/ClientAndOperationGroup-Typespec/main.tsp
index 192d0da5c76..92b137da148 100644
--- a/test/TestProjects/ClientAndOperationGroup-Cadl/ClientAndOperationGroup-Cadl.cadl
+++ b/test/TestProjects/ClientAndOperationGroup-Typespec/main.tsp
@@ -1,5 +1,6 @@
import "@cadl-lang/rest";
import "@azure-tools/cadl-dpg";
+import "@azure-tools/cadl-azure-core";
@service(
{
@@ -18,10 +19,13 @@ namespace Azure.ClientAndOperationGroupService;
using Cadl.Http;
using Azure.DPG;
+using Azure.Core;
+using Cadl.Rest;
+@autoRoute
namespace Alpha {
#suppress "@azure-tools/cadl-azure-core/use-standard-operations" "This is test code."
- @route("/Alpha")
+ @action
op one(): string;
}
diff --git a/test/TestProjects/CollectionFormat-Cadl/CollectionFormat-Cadl.cadl b/test/TestProjects/CollectionFormat-Typespec/CollectionFormat-Typespec.tsp
similarity index 78%
rename from test/TestProjects/CollectionFormat-Cadl/CollectionFormat-Cadl.cadl
rename to test/TestProjects/CollectionFormat-Typespec/CollectionFormat-Typespec.tsp
index bca239a66cb..9a810dbdc03 100644
--- a/test/TestProjects/CollectionFormat-Cadl/CollectionFormat-Cadl.cadl
+++ b/test/TestProjects/CollectionFormat-Typespec/CollectionFormat-Typespec.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
@service(
{
@@ -19,9 +20,9 @@ import "@azure-tools/cadl-azure-core";
)
namespace ArrayAsQueryOrHeader;
-using Cadl.Http;
-using Cadl.Rest;
-using Azure.DPG;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using Azure.ClientGenerator.Core;
using Azure.Core;
model Thing {
diff --git a/test/TestProjects/CollectionFormat-Cadl/CollectionFormat.csproj b/test/TestProjects/CollectionFormat-Typespec/CollectionFormat.csproj
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/CollectionFormat.csproj
rename to test/TestProjects/CollectionFormat-Typespec/CollectionFormat.csproj
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClient.cs b/test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClient.cs
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClient.cs
rename to test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClient.cs
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClientBuilderExtensions.cs b/test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClientBuilderExtensions.cs
rename to test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClientBuilderExtensions.cs
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClientOptions.cs b/test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClientOptions.cs
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/ArrayAsQueryOrHeaderClientOptions.cs
rename to test/TestProjects/CollectionFormat-Typespec/Generated/ArrayAsQueryOrHeaderClientOptions.cs
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/Configuration.json b/test/TestProjects/CollectionFormat-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/Configuration.json
rename to test/TestProjects/CollectionFormat-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/Docs/ArrayAsQueryOrHeaderClient.xml b/test/TestProjects/CollectionFormat-Typespec/Generated/Docs/ArrayAsQueryOrHeaderClient.xml
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/Docs/ArrayAsQueryOrHeaderClient.xml
rename to test/TestProjects/CollectionFormat-Typespec/Generated/Docs/ArrayAsQueryOrHeaderClient.xml
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/Models/Thing.Serialization.cs b/test/TestProjects/CollectionFormat-Typespec/Generated/Models/Thing.Serialization.cs
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/Models/Thing.Serialization.cs
rename to test/TestProjects/CollectionFormat-Typespec/Generated/Models/Thing.Serialization.cs
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/Models/Thing.cs b/test/TestProjects/CollectionFormat-Typespec/Generated/Models/Thing.cs
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/Models/Thing.cs
rename to test/TestProjects/CollectionFormat-Typespec/Generated/Models/Thing.cs
diff --git a/test/TestProjects/CollectionFormat-Cadl/Generated/cadl.json b/test/TestProjects/CollectionFormat-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/CollectionFormat-Cadl/Generated/cadl.json
rename to test/TestProjects/CollectionFormat-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Customizations-Cadl/Customizations-Cadl.cadl b/test/TestProjects/Customizations-Typespec/Customizations-Typespec.tsp
similarity index 92%
rename from test/TestProjects/Customizations-Cadl/Customizations-Cadl.cadl
rename to test/TestProjects/Customizations-Typespec/Customizations-Typespec.tsp
index e5f4dde8476..b572af47273 100644
--- a/test/TestProjects/Customizations-Cadl/Customizations-Cadl.cadl
+++ b/test/TestProjects/Customizations-Typespec/Customizations-Typespec.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
@service(
{
@@ -12,9 +13,9 @@ import "@azure-tools/cadl-azure-core";
@doc("CADL project to test various types of models.")
namespace CustomizationsInCadl;
-using Cadl.Http;
-using Cadl.Rest;
-using Azure.DPG;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using Azure.ClientGenerator.Core;
using Azure.Core;
@doc("Public model made internal")
diff --git a/test/TestProjects/Customizations-Cadl/Customizations.csproj b/test/TestProjects/Customizations-Typespec/Customizations.csproj
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations.csproj
rename to test/TestProjects/Customizations-Typespec/Customizations.csproj
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/EnumToBeMadeExtensible.cs b/test/TestProjects/Customizations-Typespec/Customizations/EnumToBeMadeExtensible.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/EnumToBeMadeExtensible.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/EnumToBeMadeExtensible.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/EnumWithValueToRename.cs b/test/TestProjects/Customizations-Typespec/Customizations/EnumWithValueToRename.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/EnumWithValueToRename.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/EnumWithValueToRename.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/ModelToChangeNamespace.cs b/test/TestProjects/Customizations-Typespec/Customizations/ModelToChangeNamespace.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/ModelToChangeNamespace.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/ModelToChangeNamespace.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/ModelToMakeInternal.cs b/test/TestProjects/Customizations-Typespec/Customizations/ModelToMakeInternal.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/ModelToMakeInternal.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/ModelToMakeInternal.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/ModelWithCustomizedProperties.cs b/test/TestProjects/Customizations-Typespec/Customizations/ModelWithCustomizedProperties.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/ModelWithCustomizedProperties.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/ModelWithCustomizedProperties.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/RenamedEnum.cs b/test/TestProjects/Customizations-Typespec/Customizations/RenamedEnum.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/RenamedEnum.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/RenamedEnum.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/RenamedModel.cs b/test/TestProjects/Customizations-Typespec/Customizations/RenamedModel.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/RenamedModel.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/RenamedModel.cs
diff --git a/test/TestProjects/Customizations-Cadl/Customizations/RootModel.cs b/test/TestProjects/Customizations-Typespec/Customizations/RootModel.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Customizations/RootModel.cs
rename to test/TestProjects/Customizations-Typespec/Customizations/RootModel.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Configuration.json b/test/TestProjects/Customizations-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Configuration.json
rename to test/TestProjects/Customizations-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClient.cs b/test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClient.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClient.cs
rename to test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClient.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClientBuilderExtensions.cs b/test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClientBuilderExtensions.cs
rename to test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClientBuilderExtensions.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClientOptions.cs b/test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClientOptions.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/CustomizationsInCadlClientOptions.cs
rename to test/TestProjects/Customizations-Typespec/Generated/CustomizationsInCadlClientOptions.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Docs/CustomizationsInCadlClient.xml b/test/TestProjects/Customizations-Typespec/Generated/Docs/CustomizationsInCadlClient.xml
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Docs/CustomizationsInCadlClient.xml
rename to test/TestProjects/Customizations-Typespec/Generated/Docs/CustomizationsInCadlClient.xml
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/EnumToBeMadeExtensible.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/EnumToBeMadeExtensible.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/EnumToBeMadeExtensible.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/EnumToBeMadeExtensible.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/EnumWithValueToRename.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/EnumWithValueToRename.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/EnumWithValueToRename.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/EnumWithValueToRename.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelToChangeNamespace.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelToChangeNamespace.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelToChangeNamespace.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelToChangeNamespace.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelToChangeNamespace.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelToChangeNamespace.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelToChangeNamespace.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelToChangeNamespace.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelToMakeInternal.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelToMakeInternal.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelToMakeInternal.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelToMakeInternal.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelToMakeInternal.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelToMakeInternal.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelToMakeInternal.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelToMakeInternal.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelWithCustomizedProperties.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelWithCustomizedProperties.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelWithCustomizedProperties.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelWithCustomizedProperties.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/ModelWithCustomizedProperties.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/ModelWithCustomizedProperties.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/ModelWithCustomizedProperties.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/ModelWithCustomizedProperties.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/RenamedEnum.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/RenamedEnum.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/RenamedEnum.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/RenamedEnum.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/RenamedModel.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/RenamedModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/RenamedModel.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/RenamedModel.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/RenamedModel.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/RenamedModel.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/RenamedModel.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/RenamedModel.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/RootModel.Serialization.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/RootModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/RootModel.Serialization.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/RootModel.Serialization.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/Models/RootModel.cs b/test/TestProjects/Customizations-Typespec/Generated/Models/RootModel.cs
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/Models/RootModel.cs
rename to test/TestProjects/Customizations-Typespec/Generated/Models/RootModel.cs
diff --git a/test/TestProjects/Customizations-Cadl/Generated/cadl.json b/test/TestProjects/Customizations-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Customizations-Cadl/Generated/cadl.json
rename to test/TestProjects/Customizations-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/FirstTest-Cadl/Customization/CadlFirstTestClient.cs b/test/TestProjects/FirstTest-Typespec/Customization/CadlFirstTestClient.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Customization/CadlFirstTestClient.cs
rename to test/TestProjects/FirstTest-Typespec/Customization/CadlFirstTestClient.cs
diff --git a/test/TestProjects/FirstTest-Cadl/FirstTest-Cadl.cadl b/test/TestProjects/FirstTest-Typespec/FirstTest-Typespec.tsp
similarity index 93%
rename from test/TestProjects/FirstTest-Cadl/FirstTest-Cadl.cadl
rename to test/TestProjects/FirstTest-Typespec/FirstTest-Typespec.tsp
index 7aa61135679..66761d1f8c7 100644
--- a/test/TestProjects/FirstTest-Cadl/FirstTest-Cadl.cadl
+++ b/test/TestProjects/FirstTest-Typespec/FirstTest-Typespec.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
@service(
{
@@ -29,8 +30,8 @@ model AuthFlow {
]
}
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
using Azure.Core;
@doc("Simple enum")
@@ -129,7 +130,7 @@ namespace Hello.Demo2 {
@doc("Return hi again")
@get
@convenientAPI(true)
- op helloAgain(@header p1: string, @body action: RoundTripModel, @Cadl.Http.header contentType: "text/plain", @path p2: string): Thing;
+ op helloAgain(@header p1: string, @body action: RoundTripModel, @header contentType: "text/plain", @path p2: string): Thing;
@route("/noContentType")
@doc("Return hi again")
diff --git a/test/TestProjects/FirstTest-Cadl/FirstTest.csproj b/test/TestProjects/FirstTest-Typespec/FirstTest.csproj
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/FirstTest.csproj
rename to test/TestProjects/FirstTest-Typespec/FirstTest.csproj
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/CadlFirstTestClient.cs b/test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClient.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/CadlFirstTestClient.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClient.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/CadlFirstTestClientBuilderExtensions.cs b/test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/CadlFirstTestClientBuilderExtensions.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClientBuilderExtensions.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/CadlfirsttestClientOptions.cs b/test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClientOptions.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/CadlfirsttestClientOptions.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/CadlFirstTestClientOptions.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Configuration.json b/test/TestProjects/FirstTest-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Configuration.json
rename to test/TestProjects/FirstTest-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Docs/CadlFirstTestClient.xml b/test/TestProjects/FirstTest-Typespec/Generated/Docs/CadlFirstTestClient.xml
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Docs/CadlFirstTestClient.xml
rename to test/TestProjects/FirstTest-Typespec/Generated/Docs/CadlFirstTestClient.xml
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/ExtensibleEnum.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/ExtensibleEnum.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/ExtensibleEnum.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/ExtensibleEnum.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/Friend.Serialization.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/Friend.Serialization.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/Friend.Serialization.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/Friend.Serialization.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/Friend.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/Friend.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/Friend.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/Friend.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/RoundTripModel.Serialization.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/RoundTripModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/RoundTripModel.Serialization.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/RoundTripModel.Serialization.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/RoundTripModel.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/RoundTripModel.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/RoundTripModel.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/RoundTripModel.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/SimpleEnum.Serialization.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/SimpleEnum.Serialization.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/SimpleEnum.Serialization.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/SimpleEnum.Serialization.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/SimpleEnum.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/SimpleEnum.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/SimpleEnum.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/SimpleEnum.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/Thing.Serialization.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/Thing.Serialization.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/Thing.Serialization.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/Thing.Serialization.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/Models/Thing.cs b/test/TestProjects/FirstTest-Typespec/Generated/Models/Thing.cs
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/Models/Thing.cs
rename to test/TestProjects/FirstTest-Typespec/Generated/Models/Thing.cs
diff --git a/test/TestProjects/FirstTest-Cadl/Generated/cadl.json b/test/TestProjects/FirstTest-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/FirstTest-Cadl/Generated/cadl.json
rename to test/TestProjects/FirstTest-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Configuration.json b/test/TestProjects/Lro-Basic-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Configuration.json
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Docs/LroBasicCadlClient.xml b/test/TestProjects/Lro-Basic-Typespec/Generated/Docs/LroBasicCadlClient.xml
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Docs/LroBasicCadlClient.xml
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Docs/LroBasicCadlClient.xml
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClient.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClient.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClient.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClientBuilderExtensions.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClientBuilderExtensions.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClientBuilderExtensions.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClientOptions.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClientOptions.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/LroBasicCadlClientOptions.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/LroBasicCadlClientOptions.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Models/Project.Serialization.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/Models/Project.Serialization.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Models/Project.Serialization.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Models/Project.Serialization.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Models/Project.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/Models/Project.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Models/Project.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Models/Project.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Models/Thing.Serialization.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/Models/Thing.Serialization.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Models/Thing.Serialization.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Models/Thing.Serialization.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/Models/Thing.cs b/test/TestProjects/Lro-Basic-Typespec/Generated/Models/Thing.cs
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/Models/Thing.cs
rename to test/TestProjects/Lro-Basic-Typespec/Generated/Models/Thing.cs
diff --git a/test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json b/test/TestProjects/Lro-Basic-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/Generated/cadl.json
rename to test/TestProjects/Lro-Basic-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Lro-Basic-Cadl/Lro-Basic-Cadl.cadl b/test/TestProjects/Lro-Basic-Typespec/Lro-Basic-Typespec.tsp
similarity index 79%
rename from test/TestProjects/Lro-Basic-Cadl/Lro-Basic-Cadl.cadl
rename to test/TestProjects/Lro-Basic-Typespec/Lro-Basic-Typespec.tsp
index 8de18f3f9a9..193c2182ed4 100644
--- a/test/TestProjects/Lro-Basic-Cadl/Lro-Basic-Cadl.cadl
+++ b/test/TestProjects/Lro-Basic-Typespec/Lro-Basic-Typespec.tsp
@@ -1,12 +1,14 @@
-import "@azure-tools/cadl-azure-core";
-import "@cadl-lang/openapi";
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Azure.DPG;
-using Cadl.Versioning;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using Azure.ClientGenerator.Core;
+using TypeSpec.Versioning;
@service(
{
@@ -25,7 +27,7 @@ using Cadl.Versioning;
namespace LroBasicCadl;
-@Cadl.Rest.resource("projects")
+@resource("projects")
model Project {
@key
@visibility("read")
@@ -56,13 +58,13 @@ interface Authoring {
}
namespace CustomCore {
- @Cadl.Rest.parentResource(T)
- @Cadl.Rest.resource("operations")
+ @parentResource(T)
+ @resource("operations")
model OperationStatusResource is Azure.Core.Foundations.OperationStatus {
operationId: string;
}
- @Cadl.Http.route("operations")
+ @route("operations")
@convenientAPI(true)
op PollingOperation is Azure.Core.ResourceRead>;
diff --git a/test/TestProjects/Lro-Basic-Cadl/LroBasicCadl.csproj b/test/TestProjects/Lro-Basic-Typespec/LroBasicTypespec.csproj
similarity index 100%
rename from test/TestProjects/Lro-Basic-Cadl/LroBasicCadl.csproj
rename to test/TestProjects/Lro-Basic-Typespec/LroBasicTypespec.csproj
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/Configuration.json b/test/TestProjects/MediaTypes-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/Configuration.json
rename to test/TestProjects/MediaTypes-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/Docs/MultipleMediaTypesClient.xml b/test/TestProjects/MediaTypes-Typespec/Generated/Docs/MultipleMediaTypesClient.xml
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/Docs/MultipleMediaTypesClient.xml
rename to test/TestProjects/MediaTypes-Typespec/Generated/Docs/MultipleMediaTypesClient.xml
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/Models/Body.Serialization.cs b/test/TestProjects/MediaTypes-Typespec/Generated/Models/Body.Serialization.cs
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/Models/Body.Serialization.cs
rename to test/TestProjects/MediaTypes-Typespec/Generated/Models/Body.Serialization.cs
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/Models/Body.cs b/test/TestProjects/MediaTypes-Typespec/Generated/Models/Body.cs
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/Models/Body.cs
rename to test/TestProjects/MediaTypes-Typespec/Generated/Models/Body.cs
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClient.cs b/test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClient.cs
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClient.cs
rename to test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClient.cs
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClientBuilderExtensions.cs b/test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClientBuilderExtensions.cs
rename to test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClientBuilderExtensions.cs
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClientOptions.cs b/test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClientOptions.cs
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/MultipleMediaTypesClientOptions.cs
rename to test/TestProjects/MediaTypes-Typespec/Generated/MultipleMediaTypesClientOptions.cs
diff --git a/test/TestProjects/MediaTypes-Cadl/Generated/cadl.json b/test/TestProjects/MediaTypes-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/Generated/cadl.json
rename to test/TestProjects/MediaTypes-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/MediaTypes-Cadl/MediaTypes-Cadl.csproj b/test/TestProjects/MediaTypes-Typespec/MediaTypes-Typespec.csproj
similarity index 100%
rename from test/TestProjects/MediaTypes-Cadl/MediaTypes-Cadl.csproj
rename to test/TestProjects/MediaTypes-Typespec/MediaTypes-Typespec.csproj
diff --git a/test/TestProjects/MediaTypes-Cadl/MediaTypes-Cadl.cadl b/test/TestProjects/MediaTypes-Typespec/MediaTypes-Typespec.tsp
similarity index 84%
rename from test/TestProjects/MediaTypes-Cadl/MediaTypes-Cadl.cadl
rename to test/TestProjects/MediaTypes-Typespec/MediaTypes-Typespec.tsp
index ecca6ef6aed..9ce0481104e 100644
--- a/test/TestProjects/MediaTypes-Cadl/MediaTypes-Cadl.cadl
+++ b/test/TestProjects/MediaTypes-Typespec/MediaTypes-Typespec.tsp
@@ -1,9 +1,9 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
@service(
{
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/Configuration.json b/test/TestProjects/MixAPIVersion-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/Configuration.json
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml b/test/TestProjects/MixAPIVersion-Typespec/Generated/Docs/MixApiVersionClient.xml
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/Docs/MixApiVersionClient.xml
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/Docs/MixApiVersionClient.xml
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClient.cs b/test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClient.cs
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClient.cs
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClient.cs
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClientBuilderExtensions.cs b/test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClientBuilderExtensions.cs
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClientBuilderExtensions.cs
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClientOptions.cs b/test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClientOptions.cs
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/MixApiVersionClientOptions.cs
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/MixApiVersionClientOptions.cs
diff --git a/test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json b/test/TestProjects/MixAPIVersion-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/Generated/cadl.json
rename to test/TestProjects/MixAPIVersion-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl b/test/TestProjects/MixAPIVersion-Typespec/MixAPIVersion-Typespec.tsp
similarity index 86%
rename from test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl
rename to test/TestProjects/MixAPIVersion-Typespec/MixAPIVersion-Typespec.tsp
index a19e36cea8e..8f5a1cbd880 100644
--- a/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion-Cadl.cadl
+++ b/test/TestProjects/MixAPIVersion-Typespec/MixAPIVersion-Typespec.tsp
@@ -1,14 +1,15 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-autorest";
-import "@azure-tools/cadl-azure-core";
-import "@cadl-lang/openapi";
-
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
-using Azure.Core;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using OpenAPI;
+using Azure.Core;
@service({title:"PetStore", version:"2022-11-30-preview"})
diff --git a/test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion.csproj b/test/TestProjects/MixAPIVersion-Typespec/MixAPIVersion.csproj
similarity index 100%
rename from test/TestProjects/MixAPIVersion-Cadl/MixAPIVersion.csproj
rename to test/TestProjects/MixAPIVersion-Typespec/MixAPIVersion.csproj
diff --git a/test/TestProjects/Models-Cadl/Generated/Configuration.json b/test/TestProjects/Models-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Configuration.json
rename to test/TestProjects/Models-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml b/test/TestProjects/Models-Typespec/Generated/Docs/ModelsInCadlClient.xml
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Docs/ModelsInCadlClient.xml
rename to test/TestProjects/Models-Typespec/Generated/Docs/ModelsInCadlClient.xml
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/BaseModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/BaseModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/BaseModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/BaseModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/BaseModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/BaseModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/BaseModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/BaseModelWithDiscriminator.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/BaseModelWithDiscriminator.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/BaseModelWithDiscriminator.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/BaseModelWithDiscriminator.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/BaseModelWithDiscriminator.cs b/test/TestProjects/Models-Typespec/Generated/Models/BaseModelWithDiscriminator.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/BaseModelWithDiscriminator.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/BaseModelWithDiscriminator.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/CollectionItem.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/CollectionItem.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/CollectionItem.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/CollectionItem.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/CollectionItem.cs b/test/TestProjects/Models-Typespec/Generated/Models/CollectionItem.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/CollectionItem.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/CollectionItem.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorA.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorA.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorA.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorA.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorA.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorA.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorA.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorA.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorB.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorB.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorB.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorB.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorB.cs b/test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorB.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/DerivedModelWithDiscriminatorB.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/DerivedModelWithDiscriminatorB.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/ErrorModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/ErrorModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/ErrorModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/ErrorModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/ErrorModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/ErrorModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/ErrorModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/ErrorModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/ExtensibleEnum.cs b/test/TestProjects/Models-Typespec/Generated/Models/ExtensibleEnum.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/ExtensibleEnum.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/ExtensibleEnum.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/FixedIntEnum.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/FixedIntEnum.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/FixedIntEnum.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/FixedIntEnum.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/FixedIntEnum.cs b/test/TestProjects/Models-Typespec/Generated/Models/FixedIntEnum.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/FixedIntEnum.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/FixedIntEnum.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/FixedStringEnum.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/FixedStringEnum.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/FixedStringEnum.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/FixedStringEnum.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/FixedStringEnum.cs b/test/TestProjects/Models-Typespec/Generated/Models/FixedStringEnum.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/FixedStringEnum.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/FixedStringEnum.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/InputModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/InputModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/InputModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/InputModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/InputModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/InputModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/InputModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/InputModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/InputRecursiveModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/InputRecursiveModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/InputRecursiveModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/InputRecursiveModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/InputRecursiveModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/InputRecursiveModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/InputRecursiveModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/InputRecursiveModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs b/test/TestProjects/Models-Typespec/Generated/Models/NoUseBase.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/NoUseBase.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/NoUseBase.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/OutputModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/OutputModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/OutputModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/OutputModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/OutputModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/OutputModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/OutputModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/OutputModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RecordItem.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RecordItem.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RecordItem.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RecordItem.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RecordItem.cs b/test/TestProjects/Models-Typespec/Generated/Models/RecordItem.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RecordItem.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RecordItem.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripOnNoUse.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripOnNoUse.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripOnNoUse.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripOnNoUse.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripOnNoUse.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOptionalModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripOptionalModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripOptionalModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripOptionalModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripOptionalModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripOptionalModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripOptionalModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripOptionalModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripPrimitiveModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripPrimitiveModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripPrimitiveModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripPrimitiveModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripPrimitiveModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripReadOnlyModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripReadOnlyModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripReadOnlyModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripReadOnlyModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripReadOnlyModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripReadOnlyModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripReadOnlyModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripReadOnlyModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripRecursiveModel.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripRecursiveModel.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripRecursiveModel.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripRecursiveModel.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/RoundTripRecursiveModel.cs b/test/TestProjects/Models-Typespec/Generated/Models/RoundTripRecursiveModel.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/RoundTripRecursiveModel.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/RoundTripRecursiveModel.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/UnknownBaseModelWithDiscriminator.Serialization.cs b/test/TestProjects/Models-Typespec/Generated/Models/UnknownBaseModelWithDiscriminator.Serialization.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/UnknownBaseModelWithDiscriminator.Serialization.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/UnknownBaseModelWithDiscriminator.Serialization.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/Models/UnknownBaseModelWithDiscriminator.cs b/test/TestProjects/Models-Typespec/Generated/Models/UnknownBaseModelWithDiscriminator.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/Models/UnknownBaseModelWithDiscriminator.cs
rename to test/TestProjects/Models-Typespec/Generated/Models/UnknownBaseModelWithDiscriminator.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs b/test/TestProjects/Models-Typespec/Generated/ModelsInCadlClient.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/ModelsInCadlClient.cs
rename to test/TestProjects/Models-Typespec/Generated/ModelsInCadlClient.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClientBuilderExtensions.cs b/test/TestProjects/Models-Typespec/Generated/ModelsInCadlClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/ModelsInCadlClientBuilderExtensions.cs
rename to test/TestProjects/Models-Typespec/Generated/ModelsInCadlClientBuilderExtensions.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/ModelsInCadlClientOptions.cs b/test/TestProjects/Models-Typespec/Generated/ModelsInCadlClientOptions.cs
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/ModelsInCadlClientOptions.cs
rename to test/TestProjects/Models-Typespec/Generated/ModelsInCadlClientOptions.cs
diff --git a/test/TestProjects/Models-Cadl/Generated/cadl.json b/test/TestProjects/Models-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Models-Cadl/Generated/cadl.json
rename to test/TestProjects/Models-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Models-Cadl/Models-Cadl.cadl b/test/TestProjects/Models-Typespec/Models-Typespec.tsp
similarity index 97%
rename from test/TestProjects/Models-Cadl/Models-Cadl.cadl
rename to test/TestProjects/Models-Typespec/Models-Typespec.tsp
index 3b93567a698..4291aedb412 100644
--- a/test/TestProjects/Models-Cadl/Models-Cadl.cadl
+++ b/test/TestProjects/Models-Typespec/Models-Typespec.tsp
@@ -1,7 +1,8 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-import "@azure-tools/cadl-azure-core";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
@service(
{
@@ -19,9 +20,9 @@ import "@azure-tools/cadl-azure-core";
@doc("CADL project to test various types of models.")
namespace ModelsInCadl;
-using Cadl.Http;
-using Cadl.Rest;
-using Azure.DPG;
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using Azure.ClientGenerator.Core;
using Azure.Core;
@doc("Base model")
diff --git a/test/TestProjects/Models-Cadl/Models.csproj b/test/TestProjects/Models-Typespec/Models.csproj
similarity index 100%
rename from test/TestProjects/Models-Cadl/Models.csproj
rename to test/TestProjects/Models-Typespec/Models.csproj
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Configuration.json b/test/TestProjects/Pagination-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Configuration.json
rename to test/TestProjects/Pagination-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Docs/PaginationClient.xml b/test/TestProjects/Pagination-Typespec/Generated/Docs/PaginationClient.xml
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Docs/PaginationClient.xml
rename to test/TestProjects/Pagination-Typespec/Generated/Docs/PaginationClient.xml
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Models/LedgerEntry.Serialization.cs b/test/TestProjects/Pagination-Typespec/Generated/Models/LedgerEntry.Serialization.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Models/LedgerEntry.Serialization.cs
rename to test/TestProjects/Pagination-Typespec/Generated/Models/LedgerEntry.Serialization.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Models/LedgerEntry.cs b/test/TestProjects/Pagination-Typespec/Generated/Models/LedgerEntry.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Models/LedgerEntry.cs
rename to test/TestProjects/Pagination-Typespec/Generated/Models/LedgerEntry.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Models/ListLedgerEntryInputBody.Serialization.cs b/test/TestProjects/Pagination-Typespec/Generated/Models/ListLedgerEntryInputBody.Serialization.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Models/ListLedgerEntryInputBody.Serialization.cs
rename to test/TestProjects/Pagination-Typespec/Generated/Models/ListLedgerEntryInputBody.Serialization.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/Models/ListLedgerEntryInputBody.cs b/test/TestProjects/Pagination-Typespec/Generated/Models/ListLedgerEntryInputBody.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/Models/ListLedgerEntryInputBody.cs
rename to test/TestProjects/Pagination-Typespec/Generated/Models/ListLedgerEntryInputBody.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/PaginationClient.cs b/test/TestProjects/Pagination-Typespec/Generated/PaginationClient.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/PaginationClient.cs
rename to test/TestProjects/Pagination-Typespec/Generated/PaginationClient.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/PaginationClientBuilderExtensions.cs b/test/TestProjects/Pagination-Typespec/Generated/PaginationClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/PaginationClientBuilderExtensions.cs
rename to test/TestProjects/Pagination-Typespec/Generated/PaginationClientBuilderExtensions.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/PaginationClientOptions.cs b/test/TestProjects/Pagination-Typespec/Generated/PaginationClientOptions.cs
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/PaginationClientOptions.cs
rename to test/TestProjects/Pagination-Typespec/Generated/PaginationClientOptions.cs
diff --git a/test/TestProjects/Pagination-Cadl/Generated/cadl.json b/test/TestProjects/Pagination-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Generated/cadl.json
rename to test/TestProjects/Pagination-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Pagination-Cadl/Pagination-Cadl.cadl b/test/TestProjects/Pagination-Typespec/Pagination-Typespec.tsp
similarity index 93%
rename from test/TestProjects/Pagination-Cadl/Pagination-Cadl.cadl
rename to test/TestProjects/Pagination-Typespec/Pagination-Typespec.tsp
index 94475fdc01e..325733851a1 100644
--- a/test/TestProjects/Pagination-Cadl/Pagination-Cadl.cadl
+++ b/test/TestProjects/Pagination-Typespec/Pagination-Typespec.tsp
@@ -1,16 +1,16 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
-import "@azure-tools/cadl-autorest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
using OpenAPI;
-using Azure.DPG;
+using Azure.ClientGenerator.Core;
//
// ** Service description **
diff --git a/test/TestProjects/Pagination-Cadl/Pagination.csproj b/test/TestProjects/Pagination-Typespec/Pagination.csproj
similarity index 100%
rename from test/TestProjects/Pagination-Cadl/Pagination.csproj
rename to test/TestProjects/Pagination-Typespec/Pagination.csproj
diff --git a/test/TestProjects/Parameters-Cadl/Generated/Configuration.json b/test/TestProjects/Parameters-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/Configuration.json
rename to test/TestProjects/Parameters-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Parameters-Cadl/Generated/Docs/ParametersCadlClient.xml b/test/TestProjects/Parameters-Typespec/Generated/Docs/ParametersCadlClient.xml
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/Docs/ParametersCadlClient.xml
rename to test/TestProjects/Parameters-Typespec/Generated/Docs/ParametersCadlClient.xml
diff --git a/test/TestProjects/Parameters-Cadl/Generated/Models/Result.Serialization.cs b/test/TestProjects/Parameters-Typespec/Generated/Models/Result.Serialization.cs
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/Models/Result.Serialization.cs
rename to test/TestProjects/Parameters-Typespec/Generated/Models/Result.Serialization.cs
diff --git a/test/TestProjects/Parameters-Cadl/Generated/Models/Result.cs b/test/TestProjects/Parameters-Typespec/Generated/Models/Result.cs
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/Models/Result.cs
rename to test/TestProjects/Parameters-Typespec/Generated/Models/Result.cs
diff --git a/test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClient.cs b/test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClient.cs
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClient.cs
rename to test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClient.cs
diff --git a/test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClientBuilderExtensions.cs b/test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClientBuilderExtensions.cs
rename to test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClientBuilderExtensions.cs
diff --git a/test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClientOptions.cs b/test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClientOptions.cs
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/ParametersCadlClientOptions.cs
rename to test/TestProjects/Parameters-Typespec/Generated/ParametersCadlClientOptions.cs
diff --git a/test/TestProjects/Parameters-Cadl/Generated/cadl.json b/test/TestProjects/Parameters-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/Generated/cadl.json
rename to test/TestProjects/Parameters-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Parameters-Cadl/Parameters-Cadl.cadl b/test/TestProjects/Parameters-Typespec/Parameters-Typespec.tsp
similarity index 61%
rename from test/TestProjects/Parameters-Cadl/Parameters-Cadl.cadl
rename to test/TestProjects/Parameters-Typespec/Parameters-Typespec.tsp
index c3bf40f5d1e..320fcef3466 100644
--- a/test/TestProjects/Parameters-Cadl/Parameters-Cadl.cadl
+++ b/test/TestProjects/Parameters-Typespec/Parameters-Typespec.tsp
@@ -1,11 +1,12 @@
-import "@azure-tools/cadl-azure-core";
-import "@cadl-lang/openapi";
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-dpg";
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
@service(
{
diff --git a/test/TestProjects/Parameters-Cadl/ParametersCadl.csproj b/test/TestProjects/Parameters-Typespec/ParametersTypespec.csproj
similarity index 100%
rename from test/TestProjects/Parameters-Cadl/ParametersCadl.csproj
rename to test/TestProjects/Parameters-Typespec/ParametersTypespec.csproj
diff --git a/test/TestProjects/PetStore-Cadl/Generated/Configuration.json b/test/TestProjects/PetStore-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/Configuration.json
rename to test/TestProjects/PetStore-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/PetStore-Cadl/Generated/Docs/PetStoreClient.xml b/test/TestProjects/PetStore-Typespec/Generated/Docs/PetStoreClient.xml
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/Docs/PetStoreClient.xml
rename to test/TestProjects/PetStore-Typespec/Generated/Docs/PetStoreClient.xml
diff --git a/test/TestProjects/PetStore-Cadl/Generated/Models/Pet.Serialization.cs b/test/TestProjects/PetStore-Typespec/Generated/Models/Pet.Serialization.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/Models/Pet.Serialization.cs
rename to test/TestProjects/PetStore-Typespec/Generated/Models/Pet.Serialization.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/Models/Pet.cs b/test/TestProjects/PetStore-Typespec/Generated/Models/Pet.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/Models/Pet.cs
rename to test/TestProjects/PetStore-Typespec/Generated/Models/Pet.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/Models/PetKind.cs b/test/TestProjects/PetStore-Typespec/Generated/Models/PetKind.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/Models/PetKind.cs
rename to test/TestProjects/PetStore-Typespec/Generated/Models/PetKind.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/PetStoreClient.cs b/test/TestProjects/PetStore-Typespec/Generated/PetStoreClient.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/PetStoreClient.cs
rename to test/TestProjects/PetStore-Typespec/Generated/PetStoreClient.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/PetStoreClientBuilderExtensions.cs b/test/TestProjects/PetStore-Typespec/Generated/PetStoreClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/PetStoreClientBuilderExtensions.cs
rename to test/TestProjects/PetStore-Typespec/Generated/PetStoreClientBuilderExtensions.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/PetStoreClientOptions.cs b/test/TestProjects/PetStore-Typespec/Generated/PetStoreClientOptions.cs
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/PetStoreClientOptions.cs
rename to test/TestProjects/PetStore-Typespec/Generated/PetStoreClientOptions.cs
diff --git a/test/TestProjects/PetStore-Cadl/Generated/cadl.json b/test/TestProjects/PetStore-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/Generated/cadl.json
rename to test/TestProjects/PetStore-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/PetStore-Cadl/PetStore-Cadl.cadl b/test/TestProjects/PetStore-Typespec/PetStore-Typespec.tsp
similarity index 91%
rename from test/TestProjects/PetStore-Cadl/PetStore-Cadl.cadl
rename to test/TestProjects/PetStore-Typespec/PetStore-Typespec.tsp
index 1547da6fb50..a5d22dab5be 100644
--- a/test/TestProjects/PetStore-Cadl/PetStore-Cadl.cadl
+++ b/test/TestProjects/PetStore-Typespec/PetStore-Typespec.tsp
@@ -1,10 +1,10 @@
-import "@cadl-lang/rest";
+import "@typespec/rest";
import "./decorators.mjs";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
-using Cadl.Http;
-using Azure.DPG;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
@service(
{
diff --git a/test/TestProjects/PetStore-Cadl/PetStore.csproj b/test/TestProjects/PetStore-Typespec/PetStore.csproj
similarity index 100%
rename from test/TestProjects/PetStore-Cadl/PetStore.csproj
rename to test/TestProjects/PetStore-Typespec/PetStore.csproj
diff --git a/test/TestProjects/PetStore-Cadl/decorators.mjs b/test/TestProjects/PetStore-Typespec/decorators.mjs
similarity index 88%
rename from test/TestProjects/PetStore-Cadl/decorators.mjs
rename to test/TestProjects/PetStore-Typespec/decorators.mjs
index 192e2f7320a..4d36b4e08b0 100644
--- a/test/TestProjects/PetStore-Cadl/decorators.mjs
+++ b/test/TestProjects/PetStore-Typespec/decorators.mjs
@@ -1,5 +1,5 @@
// pretend I just typed this file from scratch... and saved it
-import { $doc } from "@cadl-lang/compiler";
+import { $doc } from "@typespec/compiler";
export function $fancyDoc(program, target, text) {
text = ``;
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/AzureRenameGetListClientBuilderExtensions.cs b/test/TestProjects/RenameGetList-Typespec/Generated/AzureRenameGetListClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/AzureRenameGetListClientBuilderExtensions.cs
rename to test/TestProjects/RenameGetList-Typespec/Generated/AzureRenameGetListClientBuilderExtensions.cs
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/Configuration.json b/test/TestProjects/RenameGetList-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/Configuration.json
rename to test/TestProjects/RenameGetList-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml b/test/TestProjects/RenameGetList-Typespec/Generated/Docs/RenameGetListClient.xml
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/Docs/RenameGetListClient.xml
rename to test/TestProjects/RenameGetList-Typespec/Generated/Docs/RenameGetListClient.xml
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs b/test/TestProjects/RenameGetList-Typespec/Generated/RenameGetListClient.cs
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClient.cs
rename to test/TestProjects/RenameGetList-Typespec/Generated/RenameGetListClient.cs
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClientOptions.cs b/test/TestProjects/RenameGetList-Typespec/Generated/RenameGetListClientOptions.cs
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/RenameGetListClientOptions.cs
rename to test/TestProjects/RenameGetList-Typespec/Generated/RenameGetListClientOptions.cs
diff --git a/test/TestProjects/RenameGetList-Cadl/Generated/cadl.json b/test/TestProjects/RenameGetList-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/Generated/cadl.json
rename to test/TestProjects/RenameGetList-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl b/test/TestProjects/RenameGetList-Typespec/RenameGetList-Typespec.tsp
similarity index 91%
rename from test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl
rename to test/TestProjects/RenameGetList-Typespec/RenameGetList-Typespec.tsp
index 286dafd4a46..9a11332b543 100644
--- a/test/TestProjects/RenameGetList-Cadl/RenameGetList-Cadl.cadl
+++ b/test/TestProjects/RenameGetList-Typespec/RenameGetList-Typespec.tsp
@@ -1,13 +1,14 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/versioning";
-import "@azure-tools/cadl-azure-core";
-import "@azure-tools/cadl-dpg";
-
-using Cadl.Http;
-using Cadl.Rest;
-using Cadl.Versioning;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/versioning";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Http;
+using TypeSpec.Rest;
+using TypeSpec.Versioning;
using Azure.Core;
-using Azure.DPG;
+using Azure.ClientGenerator.Core;
// NOTE: These features are missing:
// - Security definition for apiKey
diff --git a/test/TestProjects/RenameGetList-Cadl/RenameGetList.csproj b/test/TestProjects/RenameGetList-Typespec/RenameGetList.csproj
similarity index 100%
rename from test/TestProjects/RenameGetList-Cadl/RenameGetList.csproj
rename to test/TestProjects/RenameGetList-Typespec/RenameGetList.csproj
diff --git a/test/TestProjects/Spread-Cadl/Generated/Configuration.json b/test/TestProjects/Spread-Typespec/Generated/Configuration.json
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Configuration.json
rename to test/TestProjects/Spread-Typespec/Generated/Configuration.json
diff --git a/test/TestProjects/Spread-Cadl/Generated/Docs/SpreadClient.xml b/test/TestProjects/Spread-Typespec/Generated/Docs/SpreadClient.xml
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Docs/SpreadClient.xml
rename to test/TestProjects/Spread-Typespec/Generated/Docs/SpreadClient.xml
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasRequest.Serialization.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasRequest.Serialization.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasRequest.Serialization.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasRequest.Serialization.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasRequest.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasRequest.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasRequest.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasRequest.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithOptionalPropsRequest.Serialization.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithOptionalPropsRequest.Serialization.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithOptionalPropsRequest.Serialization.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithOptionalPropsRequest.Serialization.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithOptionalPropsRequest.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithOptionalPropsRequest.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithOptionalPropsRequest.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithOptionalPropsRequest.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithSpreadAliasRequest.Serialization.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithSpreadAliasRequest.Serialization.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithSpreadAliasRequest.Serialization.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithSpreadAliasRequest.Serialization.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithSpreadAliasRequest.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithSpreadAliasRequest.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadAliasWithSpreadAliasRequest.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadAliasWithSpreadAliasRequest.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadMultiTargetAliasRequest.Serialization.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadMultiTargetAliasRequest.Serialization.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadMultiTargetAliasRequest.Serialization.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadMultiTargetAliasRequest.Serialization.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/SpreadMultiTargetAliasRequest.cs b/test/TestProjects/Spread-Typespec/Generated/Models/SpreadMultiTargetAliasRequest.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/SpreadMultiTargetAliasRequest.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/SpreadMultiTargetAliasRequest.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/Thing.Serialization.cs b/test/TestProjects/Spread-Typespec/Generated/Models/Thing.Serialization.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/Thing.Serialization.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/Thing.Serialization.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/Models/Thing.cs b/test/TestProjects/Spread-Typespec/Generated/Models/Thing.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/Models/Thing.cs
rename to test/TestProjects/Spread-Typespec/Generated/Models/Thing.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/SpreadClient.cs b/test/TestProjects/Spread-Typespec/Generated/SpreadClient.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/SpreadClient.cs
rename to test/TestProjects/Spread-Typespec/Generated/SpreadClient.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/SpreadClientBuilderExtensions.cs b/test/TestProjects/Spread-Typespec/Generated/SpreadClientBuilderExtensions.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/SpreadClientBuilderExtensions.cs
rename to test/TestProjects/Spread-Typespec/Generated/SpreadClientBuilderExtensions.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/SpreadClientOptions.cs b/test/TestProjects/Spread-Typespec/Generated/SpreadClientOptions.cs
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/SpreadClientOptions.cs
rename to test/TestProjects/Spread-Typespec/Generated/SpreadClientOptions.cs
diff --git a/test/TestProjects/Spread-Cadl/Generated/cadl.json b/test/TestProjects/Spread-Typespec/Generated/cadl.json
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Generated/cadl.json
rename to test/TestProjects/Spread-Typespec/Generated/cadl.json
diff --git a/test/TestProjects/Spread-Cadl/Spread-Cadl.cadl b/test/TestProjects/Spread-Typespec/Spread-Typespec.tsp
similarity index 89%
rename from test/TestProjects/Spread-Cadl/Spread-Cadl.cadl
rename to test/TestProjects/Spread-Typespec/Spread-Typespec.tsp
index 1d13e96b401..922312b8bbf 100644
--- a/test/TestProjects/Spread-Cadl/Spread-Cadl.cadl
+++ b/test/TestProjects/Spread-Typespec/Spread-Typespec.tsp
@@ -1,11 +1,12 @@
-import "@cadl-lang/rest";
-import "@cadl-lang/openapi";
-import "@azure-tools/cadl-dpg";
-import "@azure-tools/cadl-azure-core";
-
-using Cadl.Versioning;
-using Cadl.Http;
-using Azure.DPG;
+import "@typespec/rest";
+import "@typespec/http";
+import "@typespec/openapi";
+import "@azure-tools/typespec-client-generator-core";
+import "@azure-tools/typespec-azure-core";
+
+using TypeSpec.Versioning;
+using TypeSpec.Http;
+using Azure.ClientGenerator.Core;
using Azure.Core;
@service({title: "Spread"})
diff --git a/test/TestProjects/Spread-Cadl/Spread.csproj b/test/TestProjects/Spread-Typespec/Spread.csproj
similarity index 100%
rename from test/TestProjects/Spread-Cadl/Spread.csproj
rename to test/TestProjects/Spread-Typespec/Spread.csproj