Skip to content

Commit

Permalink
Merge branch 'master-github-upstream' into update_with_master_3
Browse files Browse the repository at this point in the history
  • Loading branch information
jonaslagoni committed Oct 12, 2023
2 parents 8f100f2 + 68e9a23 commit 7c1ffd2
Show file tree
Hide file tree
Showing 73 changed files with 6,855 additions and 2,239 deletions.
60 changes: 59 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,9 @@
"profile": "http://markus.poerschke.nrw",
"contributions": [
"code",
"test"
"test",
"example",
"doc"
]
},
{
Expand All @@ -684,6 +686,62 @@
"contributions": [
"bug"
]
},
{
"login": "Ksisa",
"name": "Kristupas",
"avatar_url": "https://avatars.githubusercontent.com/u/53404771?v=4",
"profile": "https://github.com/Ksisa",
"contributions": [
"code"
]
},
{
"login": "Devansh-Bhatt",
"name": "Devansh-Bhatt",
"avatar_url": "https://avatars.githubusercontent.com/u/94732079?v=4",
"profile": "https://github.com/Devansh-Bhatt",
"contributions": [
"test",
"infra"
]
},
{
"login": "pipliya",
"name": "Ansh Pancholi",
"avatar_url": "https://avatars.githubusercontent.com/u/56186142?v=4",
"profile": "https://github.com/pipliya",
"contributions": [
"code"
]
},
{
"login": "Qypol342",
"name": "Maeght Loan",
"avatar_url": "https://avatars.githubusercontent.com/u/37497007?v=4",
"profile": "https://github.com/Qypol342",
"contributions": [
"code",
"doc"
]
},
{
"login": "princerajpoot20",
"name": "Prince Rajpoot",
"avatar_url": "https://avatars.githubusercontent.com/u/44585452?v=4",
"profile": "http://princerajpoot.com",
"contributions": [
"code"
]
},
{
"login": "harshit-senpai",
"name": "harshit mishra ",
"avatar_url": "https://avatars.githubusercontent.com/u/93075068?v=4",
"profile": "https://github.com/harshit-senpai",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
3 changes: 1 addition & 2 deletions .asyncapi-tool
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"language": "TypeScript",
"technology": ["React JS", "Docker"],
"categories": ["code-generator"],
"hasCommercial": false,
"isAsyncAPIOwner": true
"hasCommercial": false
}
}
43 changes: 43 additions & 0 deletions .github/workflows/runtime-csharp-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Runtime Testing C# Models
on:
push:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- 'src/generators/csharp/**'
- 'test/runtime/runtime-csharp/**'
- 'test/runtime/**csharp**'

jobs:
test:
name: Runtime Testing C# Models
if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: Check package-lock version
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
id: lockversion
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- if: matrix.os != 'windows-latest'
name: Setup dotnet
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.x'
- if: matrix.os == 'windows-latest'
name: Setup csc.exe
uses: yoavain/Setup-CSC@v7
- name: Build library
run: npm install && npm run build:prod
- name: Generate C# models
run: npm run generate:runtime:csharp
- name: Run runtime tests
run: npm run test:runtime:csharp


32 changes: 32 additions & 0 deletions .github/workflows/runtime-go-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Runtime Testing Go Models
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/go/**'
- 'test/runtime/runtime-go/**'
- test/runtime/**go**

jobs:
test:
name: Runtime testing Go Models
if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Node.js
uses: actions/setup-node@v1
with:
node-version: 14
- name: Build Library
run: npm install && npm run build:prod
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: 1.20
-name: Generate Go Models
run: npm run generate:runtime:go
-name: Run runtime Tests
run: npm run test:runtime:go
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,4 @@ lib
output
# Where the runtime testing for Java places node modules
java_runtime_node
*.log

# API documentation
modelina-website/public/docs/api/generated
*.log
12 changes: 10 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
[![Discussions](https://img.shields.io/github/discussions/asyncapi/modelina)](https://github.com/asyncapi/modelina/discussions)
[![Website](https://img.shields.io/website?label=website&url=https%3A%2F%2Fwww.modelina.org)](https://www.modelina.org)
[![Playground](https://img.shields.io/website?label=playground&url=https%3A%2F%2Fwww.modelina.org%2Fplayground)](https://www.modelina.org/playground) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-62-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-68-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

Your one-stop tool for generating accurate and well-tested models for representing the message payloads. Use it as a tool in your development workflow, or a library in a larger integrations, entirely in your control.
Expand Down Expand Up @@ -401,9 +401,17 @@ Thanks go out to these wonderful people ([emoji key](https://allcontributors.org
<td align="center" valign="top" width="14.28%"><a href="http://jfcote.github.io"><img src="https://avatars.githubusercontent.com/u/14336900?v=4?s=100" width="100px;" alt="Jean-FranΓ§ois CΓ΄tΓ©"/><br /><sub><b>Jean-FranΓ§ois CΓ΄tΓ©</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Code">πŸ’»</a> <a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Tests">⚠️</a> <a href="#example-JFCote" title="Examples">πŸ’‘</a> <a href="https://github.com/asyncapi/modelina/commits?author=JFCote" title="Documentation">πŸ“–</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SumantxD"><img src="https://avatars.githubusercontent.com/u/65810424?v=4?s=100" width="100px;" alt="Sumant.xD"/><br /><sub><b>Sumant.xD</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=SumantxD" title="Tests">⚠️</a> <a href="#infra-SumantxD" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a> <a href="https://github.com/asyncapi/modelina/commits?author=SumantxD" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/aryanas159"><img src="https://avatars.githubusercontent.com/u/114330931?v=4?s=100" width="100px;" alt="Aryan Singh"/><br /><sub><b>Aryan Singh</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=aryanas159" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://markus.poerschke.nrw"><img src="https://avatars.githubusercontent.com/u/1222377?v=4?s=100" width="100px;" alt="Markus Poerschke"/><br /><sub><b>Markus Poerschke</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Code">πŸ’»</a> <a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://markus.poerschke.nrw"><img src="https://avatars.githubusercontent.com/u/1222377?v=4?s=100" width="100px;" alt="Markus Poerschke"/><br /><sub><b>Markus Poerschke</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Code">πŸ’»</a> <a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Tests">⚠️</a> <a href="#example-markuspoerschke" title="Examples">πŸ’‘</a> <a href="https://github.com/asyncapi/modelina/commits?author=markuspoerschke" title="Documentation">πŸ“–</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jamesmoey"><img src="https://avatars.githubusercontent.com/u/457472?v=4?s=100" width="100px;" alt="James Moey"/><br /><sub><b>James Moey</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=jamesmoey" title="Code">πŸ’»</a> <a href="https://github.com/asyncapi/modelina/commits?author=jamesmoey" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tomwolanski"><img src="https://avatars.githubusercontent.com/u/68085653?v=4?s=100" width="100px;" alt="tomwolanski"/><br /><sub><b>tomwolanski</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/issues?q=author%3Atomwolanski" title="Bug reports">πŸ›</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Ksisa"><img src="https://avatars.githubusercontent.com/u/53404771?v=4?s=100" width="100px;" alt="Kristupas"/><br /><sub><b>Kristupas</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=Ksisa" title="Code">πŸ’»</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Devansh-Bhatt"><img src="https://avatars.githubusercontent.com/u/94732079?v=4?s=100" width="100px;" alt="Devansh-Bhatt"/><br /><sub><b>Devansh-Bhatt</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=Devansh-Bhatt" title="Tests">⚠️</a> <a href="#infra-Devansh-Bhatt" title="Infrastructure (Hosting, Build-Tools, etc)">πŸš‡</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pipliya"><img src="https://avatars.githubusercontent.com/u/56186142?v=4?s=100" width="100px;" alt="Ansh Pancholi"/><br /><sub><b>Ansh Pancholi</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=pipliya" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Qypol342"><img src="https://avatars.githubusercontent.com/u/37497007?v=4?s=100" width="100px;" alt="Maeght Loan"/><br /><sub><b>Maeght Loan</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=Qypol342" title="Code">πŸ’»</a> <a href="https://github.com/asyncapi/modelina/commits?author=Qypol342" title="Documentation">πŸ“–</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://princerajpoot.com"><img src="https://avatars.githubusercontent.com/u/44585452?v=4?s=100" width="100px;" alt="Prince Rajpoot"/><br /><sub><b>Prince Rajpoot</b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=princerajpoot20" title="Code">πŸ’»</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/harshit-senpai"><img src="https://avatars.githubusercontent.com/u/93075068?v=4?s=100" width="100px;" alt="harshit mishra "/><br /><sub><b>harshit mishra </b></sub></a><br /><a href="https://github.com/asyncapi/modelina/commits?author=harshit-senpai" title="Code">πŸ’»</a></td>
</tr>
</tbody>
</table>
Expand Down
8 changes: 4 additions & 4 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,18 @@ Details which different generator options are supported.
### [Presets](./presets.md)
Goes more in-depth into how the preset system works, which enables full customization of generators.

### [Interpretation of JSON Schema](./inputs/JSON_Schema.md)
### [Interpretation of JSON Schema](./inputs/json_schema.md)
Explains how a JSON Schema is interpreted to a data model.

### [Migration](./migration.md)
### [Migration](./migrations/README.md)
As time goes on, major versions are inevitable and expected! You can find the migration guides here.

### [Coming from other tools](./other-tools.md)
Contains specific information about the differences between a lot of other common model generation tools.

### [API Documentation](https://modelina.org/docs/api)
### [API Documentation](https://modelina.org/apidocs)

No one wants to read the code to find information about it, instead use the [/docs/api](https://modelina.org/docs/api) page on the website to find what you are looking for!
No one wants to read the code to find information about it, instead use the [/apidocs](https://modelina.org/apidocs) page on the website to find what you are looking for!

### Languages
Each language has its own limitations, corner cases, and features; thus, each language has separate documentation.
Expand Down
Loading

0 comments on commit 7c1ffd2

Please sign in to comment.