Skip to content

Commit

Permalink
Merge branch 'master' into patch-spectral-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
mattias-persson authored Sep 12, 2023
2 parents eebaef0 + 27bef88 commit ab10d6b
Show file tree
Hide file tree
Showing 48 changed files with 575 additions and 200 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,15 @@
"contributions": [
"doc"
]
},
{
"login": "GreenRover",
"name": "Heiko Henning",
"avatar_url": "https://avatars.githubusercontent.com/u/512850?v=4",
"profile": "https://github.com/GreenRover",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ dist
lib
/test/commands/generate/models/
test/helpers
/test/minimaltemplate
/test/fixtures/minimaltemplate
create-glee-app
12 changes: 9 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@
!assets/examples/default-example.yaml
!assets/examples/tutorial.yml
node_modules
/test/commands/generate/models/
/test/integration/generate/models/
asyncapi.json
asyncapi.yml
test/minimaltemplate/__transpiled
test/fixtures/minimaltemplate/__transpiled
.vscode


oclif.manifest.json
spec-examples.zip
spec-examples.zip

# Coverage for testing

coverage
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ Thanks go to these wonderful people ([emoji key](https://allcontributors.org/doc
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/mhmohona"><img src="https://avatars.githubusercontent.com/u/14244685?v=4?s=100" width="100px;" alt="Mahfuza Humayra Mohona"/><br /><sub><b>Mahfuza Humayra Mohona</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=mhmohona" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/GreenRover"><img src="https://avatars.githubusercontent.com/u/512850?v=4?s=100" width="100px;" alt="Heiko Henning"/><br /><sub><b>Heiko Henning</b></sub></a><br /><a href="https://github.com/asyncapi/cli/commits?author=GreenRover" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
309 changes: 280 additions & 29 deletions assets/create-glee-app/templates/default/package-lock.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion assets/create-glee-app/templates/default/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
},
"homepage": "https://github.com/asyncapi/glee-hello-world#readme",
"dependencies": {
"@asyncapi/glee": "^0.26.2"
"@asyncapi/glee": "^0.26.3"
},
"devDependencies": {
"@types/node": "^20.5.9"
}
}
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ asyncapi/cli [COMMAND HERE]
# Example that you can run inside the cli directory after cloning this repository. First, you specify the mount in the location of your AsyncAPI specification file and then you mount it in the directory where the generation result should be saved.
docker run --rm -it \
--user=root \
-v ${PWD}/test/fixtures/asyncapi_v1.yml:/app/asyncapi.yml \
-v ${PWD}/test/integration/fixtures/asyncapi_v1.yml:/app/asyncapi.yml \
-v ${PWD}/output:/app/output \
asyncapi/cli generate fromTemplate -o /app/output /app/asyncapi.yml @asyncapi/html-template --force-write
```
Expand Down
20 changes: 10 additions & 10 deletions docs/usage.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $ npm install -g @asyncapi/cli
$ asyncapi COMMAND
running command...
$ asyncapi (--version)
@asyncapi/cli/0.54.4 linux-x64 node-v18.17.1
@asyncapi/cli/0.54.8 linux-x64 node-v18.17.1
$ asyncapi --help [COMMAND]
USAGE
$ asyncapi COMMAND
Expand Down Expand Up @@ -93,7 +93,7 @@ EXAMPLES
$ asyncapi bundle ./asyncapi.yaml ./features.yaml --base ./asyncapi.yaml --reference-into-components
```

_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/bundle.ts)_
_See code: [src/commands/bundle.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/bundle.ts)_

## `asyncapi config`

Expand All @@ -107,7 +107,7 @@ DESCRIPTION
CLI config settings
```

_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/config/index.ts)_
_See code: [src/commands/config/index.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/config/index.ts)_

## `asyncapi config context`

Expand Down Expand Up @@ -282,7 +282,7 @@ DESCRIPTION
Convert asyncapi documents older to newer versions
```

_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/convert.ts)_
_See code: [src/commands/convert.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/convert.ts)_

## `asyncapi diff OLD NEW`

Expand Down Expand Up @@ -337,7 +337,7 @@ DESCRIPTION
Find diff between two asyncapi files
```

_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/diff.ts)_
_See code: [src/commands/diff.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/diff.ts)_

## `asyncapi generate`

Expand All @@ -351,7 +351,7 @@ DESCRIPTION
Generate typed models or other things like clients, applications or docs using AsyncAPI Generator templates.
```

_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/generate/index.ts)_
_See code: [src/commands/generate/index.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/generate/index.ts)_

## `asyncapi generate fromTemplate ASYNCAPI TEMPLATE`

Expand Down Expand Up @@ -513,7 +513,7 @@ EXAMPLES
$ asyncapi new --file-name=my-asyncapi.yml --example=default-example.yml --no-tty - create a new file with a specific name, using one of the examples and without interactive mode
```

_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/new/index.ts)_
_See code: [src/commands/new/index.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/new/index.ts)_

## `asyncapi new file`

Expand Down Expand Up @@ -634,7 +634,7 @@ EXAMPLES
$ asyncapi optimize ./asyncapi.yaml --optimization=remove-components,reuse-components,move-to-components --output=terminal --no-tty
```

_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/optimize.ts)_
_See code: [src/commands/optimize.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/optimize.ts)_

## `asyncapi start`

Expand All @@ -648,7 +648,7 @@ DESCRIPTION
Start asyncapi studio
```

_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/start/index.ts)_
_See code: [src/commands/start/index.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/start/index.ts)_

## `asyncapi start studio`

Expand Down Expand Up @@ -692,5 +692,5 @@ DESCRIPTION
validate asyncapi file
```

_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.54.4/src/commands/validate.ts)_
_See code: [src/commands/validate.ts](https://github.com/asyncapi/cli/blob/v0.54.8/src/commands/validate.ts)_
<!-- commandsstop -->
3 changes: 2 additions & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import type { Config } from '@jest/types';

const config: Config.InitialOptions = {
coverageReporters: [
'text'
'text',
'html'
],
transform: {
'^.+\\.(t|j)sx?$': '@swc/jest',
Expand Down
104 changes: 92 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ab10d6b

Please sign in to comment.