Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update @asyncapi/generator to 1.15.0 version #908

Merged
merged 16 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9,019 changes: 5,499 additions & 3,520 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@asyncapi/bundler": "^0.3.8",
"@asyncapi/converter": "^1.4.0",
"@asyncapi/diff": "^0.4.1",
"@asyncapi/generator": "^1.13.1",
"@asyncapi/generator": "^1.15.0",
"@asyncapi/modelina": "^2.0.2",
"@asyncapi/openapi-schema-parser": "^3.0.5",
"@asyncapi/optimizer": "^0.2.3",
Expand Down Expand Up @@ -42,7 +42,7 @@
"serve-handler": "^6.1.3",
"strip-ansi": "^6.0.0",
"unzipper": "^0.10.11",
"wrap-ansi": "^4.0.0",
"wrap-ansi": "^9.0.0",
"ws": "^8.2.3"
},
"devDependencies": {
Expand Down
214 changes: 18 additions & 196 deletions test/fixtures/dummyspec/dummySpec.yml
Original file line number Diff line number Diff line change
@@ -1,209 +1,31 @@
asyncapi: '2.5.0'
asyncapi: 2.4.0
info:
title: Dummy example used in tests related to fetching AsyncAPI from URL
version: '1.0.0'
description: |
The Dummy API allows you to remotely manage the city lights.

### Check out its awesome features:

* Turn a specific streetlight on/off 🌃
* Dim a specific streetlight 😎
* Receive real-time information about environmental lighting conditions 📈
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0

title: Kafka test
version: '1'
servers:
production:
url: test.mosquitto.org:{port}
protocol: mqtt
description: Test broker
variables:
port:
description: Secure connection (TLS) is available through port 8883.
default: '1883'
enum:
- '1883'
- '8883'
mykafka:
url: kafka://pkc-6ojv2.us-west4.gcp.confluent.cloud:9092
protocol: kafka-secure
security:
- apiKey: []
- supportedOauthFlows:
- streetlights:on
- streetlights:off
- streetlights:dim
- openIdConnectWellKnown: []

defaultContentType: application/json

- saslScramExample: []
channels:
smartylighting/streetlights/1/0/event/{streetlightId}/lighting/measured:
description: The topic on which measured values may be produced and consumed.
parameters:
streetlightId:
$ref: '#/components/parameters/streetlightId'
test:
publish:
summary: Inform about environmental lighting conditions of a particular streetlight.
operationId: receiveLightMeasurement
traits:
- $ref: '#/components/operationTraits/kafka'
operationId: onTest
message:
$ref: '#/components/messages/lightMeasured'

smartylighting/streetlights/1/0/action/{streetlightId}/turn/on:
parameters:
streetlightId:
$ref: '#/components/parameters/streetlightId'
$ref: '#/components/messages/testMessage'
produce:
subscribe:
operationId: turnOn
traits:
- $ref: '#/components/operationTraits/kafka'
message:
$ref: '#/components/messages/turnOnOff'

smartylighting/streetlights/1/0/action/{streetlightId}/turn/off:
parameters:
streetlightId:
$ref: '#/components/parameters/streetlightId'
subscribe:
operationId: turnOff
traits:
- $ref: '#/components/operationTraits/kafka'
message:
$ref: '#/components/messages/turnOnOff'

smartylighting/streetlights/1/0/action/{streetlightId}/dim:
parameters:
streetlightId:
$ref: '#/components/parameters/streetlightId'
subscribe:
operationId: dimLight
traits:
- $ref: '#/components/operationTraits/kafka'
message:
$ref: '#/components/messages/dimLight'

$ref: '#/components/messages/testMessage'
components:
messages:
lightMeasured:
name: lightMeasured
title: Light measured
summary: Inform about environmental lighting conditions of a particular streetlight.
contentType: application/json
traits:
- $ref: '#/components/messageTraits/commonHeaders'
testMessage:
payload:
$ref: "#/components/schemas/lightMeasuredPayload"
turnOnOff:
name: turnOnOff
title: Turn on/off
summary: Command a particular streetlight to turn the lights on or off.
traits:
- $ref: '#/components/messageTraits/commonHeaders'
payload:
$ref: "#/components/schemas/turnOnOffPayload"
dimLight:
name: dimLight
title: Dim light
summary: Command a particular streetlight to dim the lights.
traits:
- $ref: '#/components/messageTraits/commonHeaders'
payload:
$ref: "#/components/schemas/dimLightPayload"

schemas:
lightMeasuredPayload:
type: object
properties:
lumens:
type: integer
minimum: 0
description: Light intensity measured in lumens.
sentAt:
$ref: "#/components/schemas/sentAt"
turnOnOffPayload:
type: object
properties:
command:
type: string
enum:
- on
- off
description: Whether to turn on or off the light.
sentAt:
$ref: "#/components/schemas/sentAt"
dimLightPayload:
type: object
properties:
percentage:
type: integer
description: Percentage to which the light should be dimmed to.
minimum: 0
maximum: 100
sentAt:
$ref: "#/components/schemas/sentAt"
sentAt:
type: string
format: date-time
description: Date and time when the message was sent.

securitySchemes:
apiKey:
type: apiKey
in: user
description: Provide your API key as the user and leave the password empty.
supportedOauthFlows:
type: oauth2
description: Flows to support OAuth 2.0
flows:
implicit:
authorizationUrl: 'https://authserver.example/auth'
scopes:
'streetlights:on': Ability to switch lights on
'streetlights:off': Ability to switch lights off
'streetlights:dim': Ability to dim the lights
password:
tokenUrl: 'https://authserver.example/token'
scopes:
'streetlights:on': Ability to switch lights on
'streetlights:off': Ability to switch lights off
'streetlights:dim': Ability to dim the lights
clientCredentials:
tokenUrl: 'https://authserver.example/token'
scopes:
'streetlights:on': Ability to switch lights on
'streetlights:off': Ability to switch lights off
'streetlights:dim': Ability to dim the lights
authorizationCode:
authorizationUrl: 'https://authserver.example/auth'
tokenUrl: 'https://authserver.example/token'
refreshUrl: 'https://authserver.example/refresh'
scopes:
'streetlights:on': Ability to switch lights on
'streetlights:off': Ability to switch lights off
'streetlights:dim': Ability to dim the lights
openIdConnectWellKnown:
type: openIdConnect
openIdConnectUrl: 'https://authserver.example/.well-known'

parameters:
streetlightId:
description: The ID of the streetlight.
schema:
type: string

messageTraits:
commonHeaders:
headers:
type: object
properties:
my-app-header:
type: integer
minimum: 0
maximum: 100

operationTraits:
kafka:
bindings:
kafka:
clientId: my-app-id
test:
type: string
securitySchemes:
saslScramExample:
type: scramSha256
1 change: 0 additions & 1 deletion test/fixtures/specification-v3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ channels:
subscribe.message.0:
$ref: '#/components/messages/turnOnOff'
customMessageId:
messageId: customMessageId
payload:
type: object
subscribe.message.2:
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/valid-specification-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ operations:
components:
messages:
UserSignedUp:
messageId: UserSignedUp
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, the messageId ! good catch

payload:
type: object
properties:
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/valid-specification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ channels:
components:
messages:
UserSignedUp:
messageId: UserSignedUp
payload:
type: object
properties:
Expand Down
1 change: 1 addition & 0 deletions test/integration/generate/fromTemplate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ describe('template', () => {
fs.writeFileSync(path.join(pathToOutput, 'random.md'), '');
});
test
.skip()
.stderr()
.command([...generalOptions, '--output=./test/docs/2'])
.it(
Expand Down