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!: release version 2 #1112

Merged
merged 91 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from 88 commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
7b85490
fix!: use preferred ids over anonymous ids (#1099)
kennethaasan Jan 26, 2023
8cdaaea
chore(release): v2.0.0-next.1 (#1113)
asyncapi-bot Jan 26, 2023
6c69b66
fix!: adds union type when operation.message.oneOf is set (#1136)
kennethaasan Feb 28, 2023
6ba6110
chore(release): v2.0.0-next.2 (#1144)
asyncapi-bot Feb 28, 2023
3200f22
Merge branch 'master-github-upstream' into feature/update_next_with_m…
jonaslagoni Mar 1, 2023
253ae3f
feat: update next with master (#1145)
jonaslagoni Mar 1, 2023
cd77ed1
chore(release): v2.0.0-next.3 (#1146)
asyncapi-bot Mar 1, 2023
2cb820f
fix!: additionalItems being applied for regular arrays (#1140)
jonaslagoni Mar 8, 2023
050fd6f
chore(release): v2.0.0-next.4 (#1151)
asyncapi-bot Mar 8, 2023
9459992
test: upgrades eslint and adds eslint-plugin-jest (#1166)
kennethaasan Mar 21, 2023
3f5ea13
fix!: fixes required properties when if/then/else is used (#1149)
kennethaasan Mar 23, 2023
e46fb00
chore(release): v2.0.0-next.5 (#1184)
asyncapi-bot Mar 23, 2023
c3aef77
Merge branch 'master-github-upstream' into update_with_master
jonaslagoni Mar 23, 2023
2640c3b
feat: update with master (#1185)
jonaslagoni Mar 23, 2023
e5db3b7
chore: update with master
jonaslagoni Mar 31, 2023
d85039f
chore: update snapshot and packagelock
jonaslagoni Mar 31, 2023
450a151
chore: update snapshot of example
jonaslagoni Mar 31, 2023
70a2d4a
chore: merge branch master into update_next_with_master
jonaslagoni Apr 4, 2023
57e1d2e
feat: update next with master (#1204)
jonaslagoni Apr 4, 2023
c83a817
feat: force release (#1221)
jonaslagoni Apr 5, 2023
49e225f
chore(release): v2.0.0-next.6 (#1222)
asyncapi-bot Apr 5, 2023
32913ad
feat!: handle const and discriminator (#1169)
kennethaasan Apr 19, 2023
7d50cf4
chore(release): v2.0.0-next.7 (#1242)
asyncapi-bot Apr 19, 2023
284cc39
fix!: should not carry over options from metaModel to constrainedMode…
kennethaasan Apr 20, 2023
b044f20
chore(release): v2.0.0-next.8 (#1247)
asyncapi-bot Apr 20, 2023
175b321
docs: fixes constant constraints documentation (#1241)
kennethaasan Apr 24, 2023
871bbeb
refactor: adds discriminator in CommonModel and interpreters (#1269)
kennethaasan May 5, 2023
d9d2c4d
refactor: adds discriminator in MetaModel and ConstrainedMetaModel (#…
kennethaasan May 8, 2023
e330457
fix!: update default Kotlin renderer to make non-required properties …
micro-jumbo May 8, 2023
3782bf0
chore(release): v2.0.0-next.9 (#1278)
asyncapi-bot May 8, 2023
a961fe3
feat!: adds interface for oneOf objects for Java (#1271)
kennethaasan May 9, 2023
6395d81
chore(release): v2.0.0-next.10 (#1279)
asyncapi-bot May 9, 2023
7dcc682
chore: update Rust union render to use ConstrainedMetaModelOptionsDis…
dlkj May 11, 2023
b6c5be6
fix wrong import
jonaslagoni May 11, 2023
2f92a82
Revert "fix wrong import"
jonaslagoni May 11, 2023
1cd5d8e
fix: wrong import for Java preset (#1283)
jonaslagoni May 11, 2023
84fde88
chore(release): v2.0.0-next.11 (#1286)
asyncapi-bot May 11, 2023
2cf1b7c
feat!: add discriminator support for OpenAPI v3 and Swagger v2 (#1281)
dlkj May 11, 2023
26f497e
chore(release): v2.0.0-next.12 (#1287)
asyncapi-bot May 11, 2023
31b789b
feat!: use EXISTING_PROPERTY as JsonTypeInfo.As annotation to avoid d…
kennethaasan May 15, 2023
a0526ac
chore(release): v2.0.0-next.13 (#1291)
asyncapi-bot May 15, 2023
b024f56
chore: blackbox tests (#1303)
dlkj May 22, 2023
53edd32
feat!: enable nullable models (#1141)
jonaslagoni May 23, 2023
4a00f19
chore(release): v2.0.0-next.14 (#1313)
asyncapi-bot May 23, 2023
fe2d69d
feat: update master into next
jonaslagoni May 23, 2023
ea0511f
chore: update new generators with next syntax
jonaslagoni May 23, 2023
7b5415c
chore: fix linting problem
jonaslagoni May 23, 2023
a55a487
feat: update next with master (#1314)
jonaslagoni May 23, 2023
cd01a8e
feat!: add java oneOf union support for properties of models (#1296)
dlkj Jun 2, 2023
db40334
chore: merge branch 'master-github-upstream' into upgrade_with_master_2
jonaslagoni Jun 25, 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
a84bf8d
feat: merge master into next (#1427)
jonaslagoni Jul 1, 2023
ee4e3ec
feat: trigger release and update dependencies (#1428)
jonaslagoni Jul 1, 2023
db2cc0e
ci: temporarily enable release for next (#1430)
jonaslagoni Jul 1, 2023
f3170d4
fix: ts/js unmarshalling function bug (#1429)
jonaslagoni Jul 2, 2023
f4ca4b2
fix!: support java nullable double type (#1439)
dlkj Jul 24, 2023
efb5450
feat: merge branch 'master-github-upstream' into update_next_with_mas…
jonaslagoni Aug 8, 2023
68d1b61
feat: update next with master (#1466)
jonaslagoni Aug 8, 2023
6de3469
feat: update release configuration and trigger release (#1467)
jonaslagoni Aug 8, 2023
67781b2
chore(release): v2.0.0-next.15 (#1468)
asyncapi-bot Aug 8, 2023
7151b91
feat: make discriminator property visible to deserializer from Java J…
dlkj Aug 9, 2023
042b45e
chore(release): v2.0.0-next.16 (#1470)
asyncapi-bot Aug 9, 2023
6f51cad
fix: typescript interface variable assignment (#1472)
Ksisa Aug 11, 2023
33c66a4
chore(release): v2.0.0-next.17 (#1473)
asyncapi-bot Aug 11, 2023
30ad86a
feat!: upgrade to node 18 (#1422)
jonaslagoni Aug 22, 2023
8deee1d
feat!: supports optional properties in java (#1485)
kennethaasan Aug 22, 2023
90157da
chore(release): v2.0.0-next.18 (#1487)
asyncapi-bot Aug 22, 2023
a6d0682
chore: add next integration example (#1488)
jonaslagoni Aug 23, 2023
4a5bb78
fix: adds format in options instead of using original input (#1486)
kennethaasan Aug 24, 2023
bdd9cb4
chore(release): v2.0.0-next.19 (#1492)
asyncapi-bot Aug 24, 2023
32e156f
feat!: generate models for OpenAPI parameters (#1498)
dlkj Sep 5, 2023
f243e43
chore(release): v2.0.0-next.20 (#1500)
asyncapi-bot Sep 5, 2023
b06ad04
fix: fixes java jackson discriminator when property is not camel case…
kennethaasan Sep 11, 2023
4f09942
chore(release): v2.0.0-next.21 (#1504)
asyncapi-bot Sep 11, 2023
cf059d4
fix: fixes performance issues in java when calling parent unions (#1501)
kennethaasan Sep 14, 2023
35d1b6c
chore(release): v2.0.0-next.22 (#1506)
asyncapi-bot Sep 14, 2023
7db1bd7
feat!: refactors generators to use the same arg types (#1505)
kennethaasan Sep 14, 2023
f027c20
chore(release): v2.0.0-next.23 (#1507)
asyncapi-bot Sep 14, 2023
e4c1bd9
fix: escape java string literals used for regex patterns and string c…
dlkj Oct 9, 2023
8f100f2
chore(release): v2.0.0-next.24 (#1558)
asyncapi-bot Oct 9, 2023
7c1ffd2
Merge branch 'master-github-upstream' into update_with_master_3
jonaslagoni Oct 12, 2023
4bc0ce0
chore: update linting and dev dependency versions
jonaslagoni Oct 12, 2023
7bbe3c3
chore: update with latest master changes (#1559)
jonaslagoni Oct 12, 2023
cf9a67a
chore: update migration guide (#1560)
jonaslagoni Oct 16, 2023
56b3edb
chore: update next with master
jonaslagoni Oct 17, 2023
b6d65be
chore: update next with master (#1570)
jonaslagoni Oct 17, 2023
2099df5
chore(release): v2.0.0-next.25 (#1571)
asyncapi-bot Oct 17, 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
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ lib
output
src/generators/template
test/generators/template
examples/integrate-with-next
examples/integrate-with-react
src/processors/TemplateInputProcessor.ts
test/processors/TemplateInputProcessor.spec.ts
Expand Down
85 changes: 30 additions & 55 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"sonarjs",
"security",
"github",
"jest",
"prettier"
],
"extends": [
Expand All @@ -13,15 +14,22 @@
"plugin:@typescript-eslint/recommended",
"plugin:sonarjs/recommended",
"plugin:security/recommended",
"plugin:jest/recommended",
"prettier"
],
"env": {
"jest/globals": true
},
"rules": {
"strict": 0,
"github/array-foreach": 2,
"eol-last": ["error", "always"],
"@typescript-eslint/no-explicit-any": 0,
"require-await": "error",
"@typescript-eslint/explicit-module-boundary-types": ["error", {"allowArgumentsExplicitlyTypedAsAny": true}],
"@typescript-eslint/explicit-module-boundary-types": [
"error",
{ "allowArgumentsExplicitlyTypedAsAny": true }
],
"sonarjs/no-small-switch": "off",
"no-underscore-dangle": "error",
"no-process-exit": "error",
Expand All @@ -30,10 +38,7 @@
"curly": ["error"],
"no-multi-spaces": "error",
"consistent-return": 0,
"consistent-this": [
0,
"self"
],
"consistent-this": [0, "self"],
"func-style": 0,
"max-nested-callbacks": ["error", 3],
"camelcase": 0,
Expand All @@ -60,15 +65,8 @@
"no-throw-literal": 2,
"no-void": 2,
"radix": 2,
"wrap-iife": [
2,
"outside"
],
"wrap-iife": [2, "outside"],
"no-shadow": 0,
"no-use-before-define": [
2,
"nofunc"
],
"no-path-concat": 2,
"valid-jsdoc": [
0,
Expand All @@ -89,29 +87,17 @@
],
"no-lonely-if": 2,
"no-floating-decimal": 2,
"comma-style": [
2,
"last"
],
"comma-style": [2, "last"],
"no-multiple-empty-lines": [
2,
{
"max": 1
}
],
"no-nested-ternary": 2,
"operator-assignment": [
2,
"always"
],
"padded-blocks": [
2,
"never"
],
"quote-props": [
2,
"as-needed"
],
"operator-assignment": [2, "always"],
"padded-blocks": [2, "never"],
"quote-props": [2, "as-needed"],
"keyword-spacing": [
2,
{
Expand All @@ -120,22 +106,10 @@
"overrides": {}
}
],
"space-before-blocks": [
2,
"always"
],
"array-bracket-spacing": [
2,
"never"
],
"computed-property-spacing": [
2,
"never"
],
"space-in-parens": [
2,
"never"
],
"space-before-blocks": [2, "always"],
"array-bracket-spacing": [2, "never"],
"computed-property-spacing": [2, "never"],
"space-in-parens": [2, "never"],
"space-unary-ops": [
2,
{
Expand All @@ -147,10 +121,7 @@
"wrap-regex": 2,
//"linebreak-style": ["error", "unix"],
"linebreak-style": 0,
"semi": [
2,
"always"
],
"semi": [2, "always"],
"arrow-spacing": [
2,
{
Expand All @@ -162,17 +133,21 @@
"no-const-assign": 2,
"no-this-before-super": 2,
"no-var": 2,
"object-shorthand": [
2,
"always"
],
"object-shorthand": [2, "always"],
"prefer-arrow-callback": 2,
"prefer-const": 2,
"prefer-spread": 2,
"prefer-template": 2,
"@typescript-eslint/no-unused-vars": 2,
"prettier/prettier": 2,
"sonarjs/no-identical-functions": "off"
"sonarjs/no-identical-functions": "off",
"sonarjs/prefer-single-boolean-return": "off",
"jest/valid-title": [
2,
{
"ignoreTypeOfDescribeName": true
}
]
},
"overrides": [
{
Expand Down Expand Up @@ -203,4 +178,4 @@
}
}
]
}
}
11 changes: 8 additions & 3 deletions .github/workflows/blackbox-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ jobs:
os: [ubuntu-latest]
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
jonaslagoni marked this conversation as resolved.
Show resolved Hide resolved
- 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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build
- uses: actions/setup-java@v2
Expand Down
12 changes: 9 additions & 3 deletions .github/workflows/coverall.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,17 @@ jobs:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- 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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: npm install, run test
run: |
npm install
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/if-nodejs-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
- next-major-spec
- beta
- alpha
- next

jobs:

Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/runtime-cplusplus-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build:prod
- name: Setup Cpp (C++ / C)
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/runtime-java-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build:prod
- uses: actions/setup-java@v2
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/runtime-kotlin-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build:prod
- name: Setup Java
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/runtime-php-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ jobs:
- 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: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Build library
run: npm install && npm run build:prod
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/runtime-rust-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,17 @@ jobs:
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: 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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build:prod
- name: Install Rust
Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/runtime-typescript-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,17 @@ jobs:
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: 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@v1
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'
- name: Build library
run: npm install && npm run build:prod
- name: Generate TypeScript models
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/website-pr-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- 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@v2
uses: actions/setup-node@v3
with:
node-version: 14
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Modelina Core Install dependencies
id: first-installation-core
run: npm install --loglevel verbose
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v18
2 changes: 2 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ branches:
prerelease: true
- name: alpha
prerelease: true
- name: next
prerelease: true
plugins:
- - "@semantic-release/commit-analyzer"
- preset: conventionalcommits
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ This is the roadmap that is currently in focus by the [CODEOWNERS](./CODEOWNERS)
## Requirements
The following are a requirement in order to use Modelina.

- [NodeJS](https://nodejs.org/en/) >= 14
- [NodeJS](https://nodejs.org/en/) >= 18

## Documentation
A feature in Modelina cannot exists without an example and documentation for it. You can find all the [documentation here](./docs/README.md).
Expand Down
3 changes: 3 additions & 0 deletions docs/constraints/CSharp.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,6 @@ These are the constraints that is applied to enum keys. The `Rule key` is what y
|NO_RESERVED_KEYWORDS|No reserved keywords|C# has a list of reserved keywords ([see the full list here](../../src/generators/csharp/Constants.ts))|
|NAMING_FORMATTER|Must be formatted equally|Model name is formatted using pascal case|
|NO_DUPLICATE_KEYS|No duplicate enum keys|If any of the above constraints changes the enum key, we must make sure that no duplicates exist within the same enum. If any is encountered `reserved_` is pre-pended. This is done recursively until no duplicates are found.|

## Constant
Constant constraints are currently not supported for CSharp.
Loading
Loading