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

feat: merge master into next #1427

Merged
merged 81 commits into from
Jul 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
02c4de5
chore: add ferror to PHP codeowners (#1308)
Ferror May 23, 2023
7c14b4a
chore(website): fixed the overlapping of playground loader (#1317)
sambhavgupta0705 May 24, 2023
811c1f1
docs: add Bhavik-ag as a contributor for design (#1320)
allcontributors[bot] May 24, 2023
f9fc5f4
chore(website): add responsive sidebar to examples (#1318)
Bhavik-ag May 24, 2023
f34078a
docs: add sambhavgupta0705 as a contributor for review (#1321)
allcontributors[bot] May 24, 2023
4408df7
docs: add sambhavgupta0705 as a contributor for design, code, and bug…
allcontributors[bot] May 24, 2023
0dc5d8d
ci: update of files from global .github repo (#1324)
asyncapi-bot May 24, 2023
e0185a4
feat: add support for AVRO, OpenAPI and RAML schema support for Async…
jonaslagoni May 25, 2023
c769710
chore(release): v1.7.0 (#1327)
asyncapi-bot May 25, 2023
75621a9
chore(website): add System.Text.Json serialization support in the pla…
kaushik-rishi May 25, 2023
1b22344
docs: add kaushik-rishi as a contributor for code, and design (#1329)
allcontributors[bot] May 25, 2023
25f7845
chore(website): add Newtonsoft support in the playground (#1337)
kaushik-rishi May 30, 2023
580aae3
fix: update @asyncapi/parser to 2.0.1 version (#1341)
asyncapi-bot May 30, 2023
288f24c
fix: update @asyncapi/openapi-schema-parser to 3.0.1 version (#1342)
asyncapi-bot May 30, 2023
d60b1e6
chore(release): v1.7.1 (#1345)
asyncapi-bot May 30, 2023
a30b38d
ci: remove unused website deploy script (#1164)
jonaslagoni May 30, 2023
47217bc
chore(website): add PHP playground support (#1306)
jonaslagoni May 30, 2023
f7a8cde
docs: add missing preset hooks for Kotlin, PHP and C++ (#1312)
jonaslagoni May 30, 2023
4983a40
chore: add AsyncAPI website tool listing (#1298)
jonaslagoni May 30, 2023
4d7f31f
chore(website): fix playground kotlin generation not working (#1307)
jonaslagoni May 30, 2023
21b5f29
chore(website): add remaining playground TypeScript options (#1301)
jonaslagoni May 30, 2023
840669f
fix: update @asyncapi/raml-dt-schema-parser to 4.0.1 version (#1343)
asyncapi-bot May 30, 2023
b4cc721
chore(website): add generic playground options (#1309)
jonaslagoni May 30, 2023
d69d59b
chore(website): fix relative reference in description of examples (#1…
jonaslagoni May 31, 2023
3e9a527
chore(website): fix react prop warning (#1349)
jonaslagoni May 31, 2023
7567927
chore(website): change edit link to descriptions (#1350)
jonaslagoni May 31, 2023
4aca998
chore(website): added overwriting equal options in CSharp Language (#…
RohithBoppey May 31, 2023
e464623
docs: add RohithBoppey as a contributor for code, and design (#1353)
allcontributors[bot] May 31, 2023
3aa5c3b
docs: clearify support of inputs in CLI (#1354)
jonaslagoni May 31, 2023
eed2b51
chore(website): change default playground namespace for PHP (#1355)
Ferror May 31, 2023
2589e67
chore(website): add 404 page (#1323)
Shurtu-gal Jun 2, 2023
764bd46
docs: add Shurtu-gal as a contributor for code (#1359)
allcontributors[bot] Jun 2, 2023
fe1d75a
test: add rust runtime tests (#1331)
Shurtu-gal Jun 2, 2023
c0e0268
docs: add Shurtu-gal as a contributor for test, and infra (#1362)
allcontributors[bot] Jun 2, 2023
421bd5f
chore(website): add namespace options for PHP, C++ and C# (#1369)
Shurtu-gal Jun 5, 2023
d8a1911
feat: add nullable mode for C# (#1356)
JFCote Jun 5, 2023
c95c1b8
chore(release): v1.8.0 (#1373)
asyncapi-bot Jun 5, 2023
3ffce70
docs: add JFCote as a contributor for code, test, and 2 more (#1374)
allcontributors[bot] Jun 5, 2023
6f0fe78
chore(website): add netlify badge (#1371)
jonaslagoni Jun 5, 2023
ed47126
chore(website): add nullable option to C# (#1377)
Shurtu-gal Jun 5, 2023
4f6ab9c
fix: inverted condition for csharp generator handle-nullable (#1378)
JFCote Jun 5, 2023
a8c0d5b
chore(release): v1.8.1 (#1379)
asyncapi-bot Jun 5, 2023
1c9e647
test: add runtime testing for PHP (#1370)
Ferror Jun 6, 2023
3fa51d5
fix: bug when generating null-forgiving for primitives and enums (#1381)
JFCote Jun 6, 2023
1fd54fc
chore(release): v1.8.2 (#1382)
asyncapi-bot Jun 6, 2023
a47b450
test: add runtime testing for kotlin (#1357)
SumantxD Jun 7, 2023
8b5701e
docs: add SumantxD as a contributor for test, infra, and code (#1383)
allcontributors[bot] Jun 7, 2023
8921f2b
fix: update @asyncapi/openapi-schema-parser to 3.0.2 version (#1386)
asyncapi-bot Jun 7, 2023
ebb6f4c
chore(release): v1.8.3 (#1388)
asyncapi-bot Jun 7, 2023
ba96502
fix: update @asyncapi/raml-dt-schema-parser to 4.0.2 version (#1387)
asyncapi-bot Jun 7, 2023
a6423ed
chore(release): v1.8.4 (#1389)
asyncapi-bot Jun 7, 2023
b20c8a4
chore(website): add packageName option for Kotlin, Java, Go (#1380)
kaushik-rishi Jun 7, 2023
a327043
chore(website): add description for options in playground (#1366)
SumantxD Jun 7, 2023
2448426
test: add TypeScript runtime testing (#1390)
jonaslagoni Jun 8, 2023
05210ba
chore: add website champions (#1394)
jonaslagoni Jun 8, 2023
31e7884
docs: add website setup to readme (#1395)
rukundob451 Jun 11, 2023
ee4484e
docs: mistyped change directory command (#1404)
rukundob451 Jun 12, 2023
a462ef3
chore(website): add descriptions for typescript options (#1399)
Shurtu-gal Jun 13, 2023
a7f6d92
chore: add java options to playground (#1400)
SumantxD Jun 13, 2023
abb54fa
chore(website): add info for general options (#1398)
SumantxD Jun 13, 2023
7182777
fix: update @asyncapi/parser to 2.0.3 version (#1406)
asyncapi-bot Jun 14, 2023
62360f8
chore(release): v1.8.5 (#1410)
asyncapi-bot Jun 14, 2023
7ee65bf
chore(website): add info to options for c++, kotlin, and go (#1412)
SumantxD Jun 15, 2023
5848105
fix: update @asyncapi/avro-schema-parser to 3.0.2 version (#1408)
asyncapi-bot Jun 16, 2023
68b3d5e
chore(release): v1.8.6 (#1413)
asyncapi-bot Jun 16, 2023
d4c6f35
chore(website): add description for PHP (#1414)
Shurtu-gal Jun 16, 2023
a58108f
docs: add initial champions guidelines (#1363)
jonaslagoni Jun 16, 2023
3205c6b
chore: remove ron-debajyoti as champion for inactivity (#1372)
jonaslagoni Jun 20, 2023
44da970
chore(website): add C# options descriptions in the playground (#1415)
codingmickey Jun 20, 2023
23af101
chore(website): add info for java options (#1411)
SumantxD Jun 24, 2023
f04bb35
chore(website): improved the layout of the lower section of playgroun…
sambhavgupta0705 Jun 24, 2023
db40334
chore: merge branch 'master-github-upstream' into upgrade_with_master_2
jonaslagoni Jun 25, 2023
b0f8839
chore(website): improved api docs (#1421)
jonaslagoni Jun 26, 2023
6201cf2
chore(revert): improved api docs #1421 (#1424)
jonaslagoni Jun 26, 2023
e086eb9
chore(website): improved api docs (#1425)
jonaslagoni Jun 26, 2023
52d024a
test: add further typescript runtime testing (#1420)
jonaslagoni Jun 26, 2023
59a32a7
feat: merge branch 'master-github-upstream' into upgrade_with_master_2
jonaslagoni Jul 1, 2023
3aa8568
chore: update dependency
jonaslagoni Jul 1, 2023
79707f1
feat: update dependencies
jonaslagoni Jul 1, 2023
2be9381
feat: update dependencies
jonaslagoni Jul 1, 2023
2993acb
feat: update dependencies
jonaslagoni Jul 1, 2023
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
72 changes: 70 additions & 2 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,11 @@
"avatar_url": "https://avatars.githubusercontent.com/u/81870866?v=4",
"profile": "https://github.com/sambhavgupta0705",
"contributions": [
"doc"
"doc",
"review",
"design",
"code",
"bug"
]
},
{
Expand Down Expand Up @@ -579,6 +583,69 @@
"example",
"review"
]
},
{
"login": "Bhavik-ag",
"name": "Bhavik Agarwal",
"avatar_url": "https://avatars.githubusercontent.com/u/73033511?v=4",
"profile": "https://codeyt.com/",
"contributions": [
"design"
]
},
{
"login": "kaushik-rishi",
"name": "Rishi",
"avatar_url": "https://avatars.githubusercontent.com/u/52498617?v=4",
"profile": "https://github.com/kaushik-rishi",
"contributions": [
"code",
"design"
]
},
{
"login": "RohithBoppey",
"name": "Rohith Boppey",
"avatar_url": "https://avatars.githubusercontent.com/u/73538974?v=4",
"profile": "https://rohithboppey.netlify.app",
"contributions": [
"code",
"design"
]
},
{
"login": "Shurtu-gal",
"name": "Ashish Padhy",
"avatar_url": "https://avatars.githubusercontent.com/u/100484401?v=4",
"profile": "http://ashishpadhy.live",
"contributions": [
"code",
"test",
"infra"
]
},
{
"login": "JFCote",
"name": "Jean-François Côté",
"avatar_url": "https://avatars.githubusercontent.com/u/14336900?v=4",
"profile": "http://jfcote.github.io",
"contributions": [
"code",
"test",
"example",
"doc"
]
},
{
"login": "SumantxD",
"name": "Sumant.xD",
"avatar_url": "https://avatars.githubusercontent.com/u/65810424?v=4",
"profile": "https://github.com/SumantxD",
"contributions": [
"test",
"infra",
"code"
]
}
],
"contributorsPerLine": 7,
Expand All @@ -587,5 +654,6 @@
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": false,
"commitConvention": "none"
"commitConvention": "none",
"commitType": "docs"
}
16 changes: 16 additions & 0 deletions .asyncapi-tool
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"title": "AsyncAPI Modelina",
"description": "Generate payload models into Java, TypeScript, Go, etc, you name it, from AsyncAPI documents. This tool gives you full control over the models through high customization",
"links": {
"websiteUrl": "https://modelina.org",
"docsUrl": "https://github.com/asyncapi/modelina/tree/master/docs",
"repoUrl": "https://github.com/asyncapi/modelina"
},
"filters": {
"language": "TypeScript",
"technology": ["React JS", "Docker"],
"categories": ["code-generator"],
"hasCommercial": false,
"isAsyncAPIOwner": true
}
}
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ src/processors/TemplateInputProcessor.ts
test/processors/TemplateInputProcessor.spec.ts
modelina-website

test/runtime/runtime-**/**
test/runtime/runtime-**
4 changes: 2 additions & 2 deletions .github/workflows/if-nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
run: npm install
- if: steps.packagejson.outputs.exists == 'true'
name: Add plugin for conventional commits for semantic-release
run: npm install [email protected]
run: npm install --save-dev [email protected]
- if: steps.packagejson.outputs.exists == 'true'
name: Publish to any of NPM, Github, and Docker Hub
id: release
Expand All @@ -123,4 +123,4 @@ jobs:
fields: repo,action,workflow
text: 'Release workflow failed in release job'
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
33 changes: 33 additions & 0 deletions .github/workflows/runtime-kotlin-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Runtime testing Kotlin models

on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/kotlin/**'
- 'test/runtime/runtime-kotlin/**'
- 'test/runtime/**kotlin**'

jobs:
test:
name: Runtime testing Kotlin Models
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 Java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: '11'
- name: Generate Kotlin models
run: npm run generate:runtime:kotlin
- name: Run runtime tests
run: npm run test:runtime:kotlin
49 changes: 49 additions & 0 deletions .github/workflows/runtime-php-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Runtime testing PHP models
on:
push:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
paths:
- 'src/generators/php/**'
- 'test/runtime/runtime-php/**'
- 'test/runtime/**php**'

jobs:
runtime-php-test:
name: Runtime testing PHP ${{ matrix.php }} 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
strategy:
fail-fast: false
matrix:
php:
- 8.1
- 8.2
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 14

- name: Build library
run: npm install && npm run build:prod

- name: Setup PHP
uses: shivammathur/[email protected]
with:
php-version: ${{ matrix.php }}

- name: Generate Models
run: npm run generate:runtime:php

- name: Install PHP Dependencies
uses: ramsey/composer-install@v2
with:
working-directory: test/runtime/runtime-php

- name: Run runtime tests
run: composer test
working-directory: test/runtime/runtime-php
36 changes: 36 additions & 0 deletions .github/workflows/runtime-rust-testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Runtime Testing Rust Models
on:
push:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
paths:
- 'src/generators/rust/**'
- 'test/runtime/runtime-rust/**'
- 'test/runtime/**rust**'

jobs:
test:
name: Runtime Testing Rust 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: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
components: rustfmt, clippy, rust-src
- name: Generate Rust models
run: npm run generate:runtime:rust
- name: Run runtime tests
run: npm run test:runtime:rust


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

jobs:
test:
name: Runtime Testing TypeScript 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: Generate TypeScript models
run: npm run generate:runtime:typescript
- name: Run runtime tests
run: npm run test:runtime:typescript


17 changes: 0 additions & 17 deletions .github/workflows/website-deploy.yml

This file was deleted.

5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ lib
output
# Where the runtime testing for Java places node modules
java_runtime_node
*.log
*.log

# API documentation
modelina-website/public/docs/api/generated
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
lib
node_modules
modelina-website
modelina-website
test/runtime/runtime-**
Loading