This commit is contained in:
iscai-msft 2022-10-13 14:32:29 -07:00 коммит произвёл GitHub
Родитель f3e305eeb0
Коммит 38d1672d0f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
11 изменённых файлов: 136 добавлений и 91 удалений

Просмотреть файл

@ -0,0 +1,8 @@
---
"@azure-tools/cadl-ranch": patch
"@azure-tools/cadl-ranch-dashboard": patch
"@azure-tools/cadl-ranch-expect": patch
"@azure-tools/cadl-ranch-specs": patch
---
bump cadl dependencies

Просмотреть файл

@ -4,8 +4,7 @@
Decorator setting up the boilerplate for specs service namespace. Will automatically set:
- `@serviceTitle` using the namespace as a value
- `@serviceVersion` to `1.0.0`
- `@service{title: '<namespace>', value: '1.0.0'}` using the namespace as a value
- `@server` to `localhost:3000`
- `@route` using the parameter passed.

Просмотреть файл

@ -27,7 +27,7 @@ op returnString(): string;
Decorators that should be provided in this test library `@azure-tools/cadl-scenario-lib`:
- `@scenarioTitle`: Specify the base url for that scenario and sets up some of the boilerplate(`@serviceTitle`, `@serviceVersion`, etc.)
- `@scenarioTitle`: Specify the base url for that scenario and sets up some of the boilerplate(`@service` etc.)
- `@scenario`: Specify that this operation, interface or namespace is a scenario. Optionally take a scenario name otherwise default to the namespace name + operation/interface name
- `@scenarioDoc`: Specify how to implement this scenario. Differ from `@doc` which describe the scenario to the end user.
- `@supportedBy`: Specify if something is supported only by some kind of SDK. Option: `arm`, `dpg`. By default everything.

Просмотреть файл

@ -34,7 +34,7 @@
"typescript": "^4.8.3"
},
"peerDependencies": {
"@cadl-lang/compiler": "~0.35.0",
"@cadl-lang/rest": "~0.17.0"
"@cadl-lang/compiler": "~0.36.0",
"@cadl-lang/rest": "~0.18.0"
}
}

Просмотреть файл

@ -1,6 +1,5 @@
import {
$serviceTitle,
$serviceVersion,
$service,
createDecoratorDefinition,
DecoratorContext,
getServiceNamespace,
@ -211,8 +210,19 @@ export function $scenarioService(context: DecoratorContext, target: Namespace, r
return;
}
context.program.stateSet(ScenarioServiceKey).add(target);
context.call($serviceTitle, target, context.program.checker.getNamespaceString(target).replace(/\./g, ""));
context.call($serviceVersion, target, "1.0.0");
context.call($service, target, {
kind: "Model",
properties: new Map()
.set("title", {
type: { kind: "String", value: context.program.checker.getNamespaceString(target).replace(/\./g, "") },
})
.set("version", { type: { kind: "String", value: "1.0.0" } }),
decorators: [],
projections: [],
name: "Service",
derivedModels: [],
projectionsByName: [],
} as any);
context.call($server, target, "http://localhost:3000", "TestServer endpoint");
context.call($route, target, route);
}

Просмотреть файл

@ -25,30 +25,49 @@ enum Mode {
"model",
}
@doc("Product resource")
@resource("products")
model Product {
@key key: string;
@doc("key of product")
@key
key: string;
@doc("received mode")
received: Mode;
}
@doc("Returns {'received': <mode>}")
model ProductResponse {
@statusCode statusCode: 200;
@body body: Product;
@doc("Status code of response")
@statusCode
statusCode: 200;
@doc("Actual product")
@body
body: Product;
}
@doc("Input to LRO call")
model Input {
@doc("property on the input")
hello: string;
}
@doc("Final response from LRO call")
model LROProduct extends Product {
@doc("Provisioning state returned by the service")
provisioningState: string;
}
@doc("Initial response with ProvisioningState='Succeeded'")
model LROProductResponse {
@statusCode statusCode: 200;
@body body: LROProduct;
@doc("Status code for LRO response")
@statusCode
statusCode: 200;
@doc("Body of LRO response")
@body
body: LROProduct;
}
#suppress "@azure-tools/cadl-azure-core/use-standard-operations" "For testing"

Просмотреть файл

@ -37,10 +37,10 @@
"@azure-tools/cadl-ranch-api": "workspace:~"
},
"devDependencies": {
"@azure-tools/cadl-autorest": "0.20.0",
"@azure-tools/cadl-autorest": "0.21.0",
"@cadl-lang/eslint-config-cadl": "^0.4.1",
"@cadl-lang/openapi": "0.12.0",
"@cadl-lang/openapi3": "0.15.0",
"@cadl-lang/openapi": "0.13.0",
"@cadl-lang/openapi3": "0.16.0",
"@types/node": "^18.7.16",
"eslint": "^8.23.1",
"prettier": "^2.7.1",
@ -48,10 +48,10 @@
"typescript": "^4.8.3"
},
"peerDependencies": {
"@azure-tools/cadl-azure-core": "~0.7.0",
"@azure-tools/cadl-azure-core": "~0.8.0",
"@azure-tools/cadl-ranch-expect": "workspace:~",
"@cadl-lang/compiler": "~0.35.0",
"@cadl-lang/rest": "~0.17.0",
"@cadl-lang/versioning": "~0.8.0"
"@cadl-lang/compiler": "~0.36.0",
"@cadl-lang/rest": "~0.18.0",
"@cadl-lang/versioning": "~0.9.0"
}
}

Просмотреть файл

@ -33,8 +33,8 @@
"@azure-tools/cadl-ranch-coverage-sdk": "workspace:~",
"@azure-tools/cadl-ranch-expect": "workspace:~",
"@azure/identity": "^3.0.0",
"@cadl-lang/compiler": "~0.35.0",
"@cadl-lang/rest": "~0.17.0",
"@cadl-lang/compiler": "~0.36.0",
"@cadl-lang/rest": "~0.18.0",
"@types/js-yaml": "^4.0.5",
"ajv": "8.11.0",
"body-parser": "^1.20.0",

Просмотреть файл

@ -17,7 +17,7 @@ export async function validateMockApis({ scenariosPath }: ValidateMockApisConfig
const diagnostics = createDiagnosticReporter();
for (const { name, cadlFilePath } of scenarioFiles) {
logger.debug(`Found scenario "${cadlFilePath}"`);
const program = await cadlCompiler.compile(cadlFilePath, cadlCompiler.NodeHost, {
const program = await cadlCompiler.compile(cadlCompiler.NodeHost, cadlFilePath, {
noEmit: true,
warningAsError: true,
});

Просмотреть файл

@ -50,7 +50,7 @@ export async function loadScenarios(scenariosPath: string): Promise<[Scenario[],
for (const { name, cadlFilePath } of scenarioFiles) {
logger.debug(`Found scenario "${cadlFilePath}"`);
const program = await cadlCompiler.compile(cadlFilePath, cadlCompiler.NodeHost, {
const program = await cadlCompiler.compile(cadlCompiler.NodeHost, cadlFilePath, {
additionalImports: ["@azure-tools/cadl-ranch-expect"],
noEmit: true,
warningAsError: true,

Просмотреть файл

@ -39,9 +39,9 @@ importers:
'@azure-tools/cadl-ranch-coverage-sdk': workspace:~
'@azure-tools/cadl-ranch-expect': workspace:~
'@azure/identity': ^3.0.0
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/eslint-config-cadl': ^0.4.1
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/rest': ~0.18.0
'@types/body-parser': ^1.19.2
'@types/deep-equal': ^1.0.1
'@types/express': ^4.17.13
@ -75,8 +75,8 @@ importers:
'@azure-tools/cadl-ranch-coverage-sdk': link:../cadl-ranch-coverage-sdk
'@azure-tools/cadl-ranch-expect': link:../cadl-ranch-expect
'@azure/identity': 3.0.0
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
'@types/js-yaml': 4.0.5
ajv: 8.11.0
body-parser: 1.20.0
@ -215,17 +215,17 @@ importers:
packages/cadl-ranch-expect:
specifiers:
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/eslint-config-cadl': ^0.4.1
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/rest': ~0.18.0
'@types/node': ^18.7.16
eslint: ^8.23.1
prettier: ^2.7.1
rimraf: ^3.0.2
typescript: ^4.8.3
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
devDependencies:
'@cadl-lang/eslint-config-cadl': 0.4.1_prettier@2.7.1
'@types/node': 18.7.16
@ -236,35 +236,35 @@ importers:
packages/cadl-ranch-specs:
specifiers:
'@azure-tools/cadl-autorest': 0.20.0
'@azure-tools/cadl-azure-core': ~0.7.0
'@azure-tools/cadl-autorest': 0.21.0
'@azure-tools/cadl-azure-core': ~0.8.0
'@azure-tools/cadl-ranch': workspace:~
'@azure-tools/cadl-ranch-api': workspace:~
'@azure-tools/cadl-ranch-expect': workspace:~
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/eslint-config-cadl': ^0.4.1
'@cadl-lang/openapi': 0.12.0
'@cadl-lang/openapi3': 0.15.0
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/versioning': ~0.8.0
'@cadl-lang/openapi': 0.13.0
'@cadl-lang/openapi3': 0.16.0
'@cadl-lang/rest': ~0.18.0
'@cadl-lang/versioning': ~0.9.0
'@types/node': ^18.7.16
eslint: ^8.23.1
prettier: ^2.7.1
rimraf: ^3.0.2
typescript: ^4.8.3
dependencies:
'@azure-tools/cadl-azure-core': 0.7.0_hwxydnmfmbbljm4krsocnj5vz4
'@azure-tools/cadl-azure-core': 0.8.0_3pd4sm4th6nk27up5cmpiwrrt4
'@azure-tools/cadl-ranch': link:../cadl-ranch
'@azure-tools/cadl-ranch-api': link:../cadl-ranch-api
'@azure-tools/cadl-ranch-expect': link:../cadl-ranch-expect
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/versioning': 0.8.0
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
'@cadl-lang/versioning': 0.9.0
devDependencies:
'@azure-tools/cadl-autorest': 0.20.0_66qn2oh2x2b5pavqwwd54rnqay
'@azure-tools/cadl-autorest': 0.21.0_6rhiai7lsdbfsqzlxkwbmd4aje
'@cadl-lang/eslint-config-cadl': 0.4.1_prettier@2.7.1
'@cadl-lang/openapi': 0.12.0_hwxydnmfmbbljm4krsocnj5vz4
'@cadl-lang/openapi3': 0.15.0_mqhkef5k7zf4mhalea57yqj7fu
'@cadl-lang/openapi': 0.13.0_3pd4sm4th6nk27up5cmpiwrrt4
'@cadl-lang/openapi3': 0.16.0_pxgbdm46wrhn3uuhzlldsae77q
'@types/node': 18.7.16
eslint: 8.23.1
prettier: 2.7.1
@ -280,32 +280,33 @@ packages:
'@jridgewell/gen-mapping': 0.1.1
'@jridgewell/trace-mapping': 0.3.15
/@azure-tools/cadl-autorest/0.20.0_66qn2oh2x2b5pavqwwd54rnqay:
resolution: {integrity: sha512-2nwa0yLJqUAyQ41oS6sNiKdjlMI2sX6qFJfb4SBoWQhxSiX67V5cbJ3b+fqCRherjYB4geF5s61DjOKgjh40zg==}
/@azure-tools/cadl-autorest/0.21.0_6rhiai7lsdbfsqzlxkwbmd4aje:
resolution: {integrity: sha512-MyMXD7Md1OkqNewWgj3oiz8JLchpEP8dQxry4NZ0xU6OTXL+lEUTLrD4lhPH2NdY1WaK7sZmLLetrfq94W8GVA==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@azure-tools/cadl-azure-core': ~0.7.0
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/openapi': ~0.12.0
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/versioning': ~0.8.0
'@azure-tools/cadl-azure-core': ~0.8.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/openapi': ~0.13.0
'@cadl-lang/rest': ~0.18.0
'@cadl-lang/versioning': ~0.9.0
dependencies:
'@azure-tools/cadl-azure-core': 0.7.0_hwxydnmfmbbljm4krsocnj5vz4
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/openapi': 0.12.0_hwxydnmfmbbljm4krsocnj5vz4
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/versioning': 0.8.0
'@azure-tools/cadl-azure-core': 0.8.0_3pd4sm4th6nk27up5cmpiwrrt4
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/openapi': 0.13.0_3pd4sm4th6nk27up5cmpiwrrt4
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
'@cadl-lang/versioning': 0.9.0
dev: true
/@azure-tools/cadl-azure-core/0.7.0_hwxydnmfmbbljm4krsocnj5vz4:
resolution: {integrity: sha512-rl94XppY4Z6Eg9W/h9MEHo/mITQWsA32uSrtGh0nhGMOVAoQwp0OU0vIivI4oGNdc0tfnFYKUXoFAfEJcrCEBw==}
/@azure-tools/cadl-azure-core/0.8.0_3pd4sm4th6nk27up5cmpiwrrt4:
resolution: {integrity: sha512-/bgX0lW10QBFV0q/Kd+kYEo/GQLPiMHz0xNNjMqEoMWfMINy1D1B2l238/cOrEspYl01fcReBlWPCanm8Iv9Cw==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/rest': ~0.18.0
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/lint': 0.2.0_@cadl-lang+compiler@0.36.0
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
/@azure/abort-controller/1.1.0:
resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
@ -855,8 +856,8 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
/@cadl-lang/compiler/0.35.0:
resolution: {integrity: sha512-0hztF32Qev2K6NAenVx6at8zYGwaWrIVRIFdqyp3/6ZDJ3q8yffH9eERP0ddq2E5TOtKlWF52MgvuIOWY9qyEQ==}
/@cadl-lang/compiler/0.36.0:
resolution: {integrity: sha512-FzB9fap8EnILTXKRJbXKNJzhV3yyxLWvDSsFjDvPqbb8ilcNGRGF74fo4GWU5/s4eRYsJ70BWao7VyC/BniSjQ==}
engines: {node: '>=16.0.0'}
hasBin: true
dependencies:
@ -893,30 +894,38 @@ packages:
- supports-color
dev: true
/@cadl-lang/openapi/0.12.0_hwxydnmfmbbljm4krsocnj5vz4:
resolution: {integrity: sha512-yoP/gO03oZ09e3n0oW6XgAIcVqBcUmPLQEPvrYqo0/UsZx/ibGZG8oKhhf/C3Kqrp0Vr/qcr6y7SV3NCEHE8bw==}
/@cadl-lang/lint/0.2.0_@cadl-lang+compiler@0.36.0:
resolution: {integrity: sha512-A+X1Os4kuOPut9m4da+1ldxig3c6ml2MbeROy7AP+7GnPuq7jZs2nqqYR0yB1k50z6r2F9xzciR1nxLWBmb9iw==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/compiler': ~0.36.0
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/compiler': 0.36.0
/@cadl-lang/openapi/0.13.0_3pd4sm4th6nk27up5cmpiwrrt4:
resolution: {integrity: sha512-5SZ9j69bD4VyYG34rf09UAhM/yoXrSCqgpYD/MMsBokGOZ13DwvIIrj8iC7xY89v2a0N0KJcap0/LfPo9F/pjw==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/rest': ~0.18.0
dependencies:
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
dev: true
/@cadl-lang/openapi3/0.15.0_mqhkef5k7zf4mhalea57yqj7fu:
resolution: {integrity: sha512-Ee0muF6/S1eLDDQ9m2/R0N/PeXNNM7J3Q+JHWNE0SepJb/LTlihyN5n/0MAAsaT0mPXoQwSe5Lt8lZ3KaDULqQ==}
/@cadl-lang/openapi3/0.16.0_pxgbdm46wrhn3uuhzlldsae77q:
resolution: {integrity: sha512-NOUqggVfnpY1jc/ETvQ977G+7kkhFPPjaLoZKyugjKZS6uE1MINSoSi13FjD5Ye56i3C5Wc7krVK8ldtgvceyg==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/openapi': ~0.12.0
'@cadl-lang/rest': ~0.17.0
'@cadl-lang/versioning': ~0.8.0
'@cadl-lang/compiler': ~0.36.0
'@cadl-lang/openapi': ~0.13.0
'@cadl-lang/rest': ~0.18.0
'@cadl-lang/versioning': ~0.9.0
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/openapi': 0.12.0_hwxydnmfmbbljm4krsocnj5vz4
'@cadl-lang/rest': 0.17.0_@cadl-lang+compiler@0.35.0
'@cadl-lang/versioning': 0.8.0
'@cadl-lang/compiler': 0.36.0
'@cadl-lang/openapi': 0.13.0_3pd4sm4th6nk27up5cmpiwrrt4
'@cadl-lang/rest': 0.18.0_@cadl-lang+compiler@0.36.0
'@cadl-lang/versioning': 0.9.0
dev: true
/@cadl-lang/prettier-plugin-cadl/0.5.15:
@ -925,19 +934,19 @@ packages:
prettier: 2.7.1
dev: true
/@cadl-lang/rest/0.17.0_@cadl-lang+compiler@0.35.0:
resolution: {integrity: sha512-Q5UhVXWXW3XAuri/cAYLw3NJleCXzmqu9TDh6mc+YWbRThvfWx2GYKRbp+7WWCWI1e0zAQt4D49WkYwr/4OJRA==}
/@cadl-lang/rest/0.18.0_@cadl-lang+compiler@0.36.0:
resolution: {integrity: sha512-ZDP/r4dfAvLCSPRrpd+Pzp7Y/VXUWDy8NBuVvAJpiRm1Oo5sRMD0d8Mgc0ag4L/EMyfaJLeAj1wwKUVAk4jPbg==}
engines: {node: '>=16.0.0'}
peerDependencies:
'@cadl-lang/compiler': ~0.35.0
'@cadl-lang/compiler': ~0.36.0
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/compiler': 0.36.0
/@cadl-lang/versioning/0.8.0:
resolution: {integrity: sha512-TF5iWtJEaQBKmo4RN/yvzdllWwwCWVTbQnEHHAefVRoq4/ThwO5mGKZI8/RG9zeHcJOGHlvGKyu7n1xY4SlqUw==}
/@cadl-lang/versioning/0.9.0:
resolution: {integrity: sha512-RM2h/wVzfjjYLNUIbEtXezsugvdu6aFIAH7v7dMC6kmMvQYNA39C6k0z6Xbk4H5+vk26JbnHDAvQaydxOa7uXQ==}
engines: {node: '>=16.0.0'}
dependencies:
'@cadl-lang/compiler': 0.35.0
'@cadl-lang/compiler': 0.36.0
/@changesets/apply-release-plan/6.1.0:
resolution: {integrity: sha512-fMNBUAEc013qaA4KUVjdwgYMmKrf5Mlgf6o+f97MJVNzVnikwpWY47Lc3YR1jhC874Fonn5MkjkWK9DAZsdQ5g==}
@ -1162,8 +1171,8 @@ packages:
'@cspell/dict-docker': 1.1.1
'@cspell/dict-dotnet': 2.0.1
'@cspell/dict-elixir': 2.0.1
'@cspell/dict-en-gb': 1.1.33
'@cspell/dict-en_us': 2.3.3
'@cspell/dict-en-gb': 1.1.33
'@cspell/dict-filetypes': 2.1.1
'@cspell/dict-fonts': 2.1.0
'@cspell/dict-fullstack': 2.0.6