From 1e55f7ac33fa6fe2f17eb7a8adec7c6f20a0b520 Mon Sep 17 00:00:00 2001 From: Jonas Lagoni Date: Mon, 25 Dec 2023 06:45:13 -1000 Subject: [PATCH 1/3] update docs --- README.md | 10 +- docs/integration.md | 2 +- docs/languages/Java.md | 2 +- docs/usage.md | 7 +- examples/README.md | 81 ++++-- examples/custom-logging/package-lock.json | 10 - examples/custom-logging/package.json | 9 - .../dart-generate-json-annotation/README.md | 2 +- .../integrate-modelina-into-maven/README.md | 3 - .../maven-project/.gitignore | 25 -- .../maven-project/README.md | 10 - .../maven-project/asyncapi.json | 26 -- .../maven-project/pom.xml | 113 -------- .../scripts/modelina/generate.ts | 22 -- .../scripts/modelina/package-lock.json | 243 ------------------ .../scripts/modelina/package.json | 10 - .../com/mycompany/app/AnonymousSchema_1.java | 11 - .../package-lock.json | 10 - .../package.json | 12 - examples/php-generate-models/README.md | 17 -- .../__snapshots__/index.spec.ts.snap | 14 - examples/php-generate-models/index.spec.ts | 15 -- examples/php-generate-models/index.ts | 24 -- .../php-generate-models/package-lock.json | 10 - examples/php-generate-models/package.json | 10 - jest.config.js | 2 +- modelina-website/scripts/build-examples.js | 2 +- package.json | 4 +- .../AsyncAPIInputProcessor.spec.ts.snap | 16 +- 29 files changed, 89 insertions(+), 633 deletions(-) delete mode 100644 examples/custom-logging/package-lock.json delete mode 100644 examples/custom-logging/package.json delete mode 100644 examples/integrate-modelina-into-maven/README.md delete mode 100644 examples/integrate-modelina-into-maven/maven-project/.gitignore delete mode 100644 examples/integrate-modelina-into-maven/maven-project/README.md delete mode 100644 examples/integrate-modelina-into-maven/maven-project/asyncapi.json delete mode 100644 examples/integrate-modelina-into-maven/maven-project/pom.xml delete mode 100644 examples/integrate-modelina-into-maven/maven-project/scripts/modelina/generate.ts delete mode 100644 examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package-lock.json delete mode 100644 examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package.json delete mode 100644 examples/integrate-modelina-into-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java delete mode 100644 examples/integrate-modelina-into-maven/package-lock.json delete mode 100644 examples/integrate-modelina-into-maven/package.json delete mode 100644 examples/php-generate-models/README.md delete mode 100644 examples/php-generate-models/__snapshots__/index.spec.ts.snap delete mode 100644 examples/php-generate-models/index.spec.ts delete mode 100644 examples/php-generate-models/index.ts delete mode 100644 examples/php-generate-models/package-lock.json delete mode 100644 examples/php-generate-models/package.json diff --git a/README.md b/README.md index 2ed79fbaf4..0038e5946b 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,6 @@ Your one-stop tool for generating accurate and well-tested models for representi - [Installing Modelina](#installing-modelina) - [AsyncAPI CLI](#asyncapi-cli) - [Features](#features) -- [Roadmap](#roadmap) - [Requirements](#requirements) - [Documentation](#documentation) - [Examples](#examples) @@ -266,13 +265,12 @@ The following table provides a short summary of available features for supported PHP Class and enum generation: custom indentation type and size, descriptions, etc + + Scala + Class and enum generation: custom indentation type and size, descriptions, etc + -## Roadmap -This is the roadmap that is currently in focus by the [CODEOWNERS](./CODEOWNERS) - -- [1 year roadmap](https://github.com/asyncapi/modelina/milestone/4) - ## Requirements The following are a requirement in order to use Modelina. diff --git a/docs/integration.md b/docs/integration.md index 786995da29..d3aaa071a1 100644 --- a/docs/integration.md +++ b/docs/integration.md @@ -64,7 +64,7 @@ There are at least two ways you can integrate Modelina into your build process f - DO work with other inputs then AsyncAPI - DO work when needing extensive build options and configurations -Checkout the Maven example here: [Integrate Modelina into Maven](../examples/integrate-modelina-into-maven) +Checkout the Maven example here: [Integrate Modelina into Maven](../examples/integrate-with-maven) **AsyncAPI CLI** diff --git a/docs/languages/Java.md b/docs/languages/Java.md index d16a820e39..6b5197a490 100644 --- a/docs/languages/Java.md +++ b/docs/languages/Java.md @@ -95,4 +95,4 @@ Currently not supported, [let everyone know you need it](https://github.com/asyn Currently not supported, [let everyone know you need it](https://github.com/asyncapi/modelina/issues/new?assignees=&labels=enhancement&template=enhancement.md)! ## Integrate Modelina into Maven -We have created an example Maven project to show you how to generate AsyncAPI payload models from your AsyncAPI file and integrate it into the build process. [You can find the integration example here](../integration.md#integrate-modelina-into-maven). \ No newline at end of file +We have created an example Maven project to show you how to generate AsyncAPI payload models from your AsyncAPI file and integrate it into the build process. [You can find the integration example here](../integration.md#integrate-with-maven). \ No newline at end of file diff --git a/docs/usage.md b/docs/usage.md index 247faf4a9e..4862187807 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -35,6 +35,7 @@ For more specific integration options, please check out the [integration documen - [Generate Kotlin models](#generate-kotlin-models) - [Generate C++ (cplusplus) models](#generate-c-cplusplus-models) - [Generate PHP models](#generate-php-models) +- [Generate Scala models](#generate-scala-models) @@ -201,4 +202,8 @@ C++ is one of the many output languages we support. Check out this [basic exampl ## Generate PHP models -PHP is one of the many output languages we support. Check out this [basic example for a live demonstration](../examples/php-generate-models/) and the following [PHP documentation for more advanced use-cases](./languages/Php.md). \ No newline at end of file +PHP is one of the many output languages we support. Check out this [basic example for a live demonstration](../examples/generate-php-models/) and the following [PHP documentation for more advanced use-cases](./languages/Php.md). + +## Generate Scala models + +Scala is one of the many output languages we support. Check out this [basic example for a live demonstration](../examples/generate-scala-models/) and the following [Scala documentation for more advanced use-cases](./languages/Scala.md). \ No newline at end of file diff --git a/examples/README.md b/examples/README.md index 67911e0fc1..41d24576c4 100644 --- a/examples/README.md +++ b/examples/README.md @@ -16,13 +16,19 @@ We love contributions and new examples that does not already exist, you can foll - [General examples](#general-examples) - [Simple generator examples](#simple-generator-examples) - [Integrations](#integrations) -- [Python](#python) -- [JavaScript](#javascript) -- [Java](#java) -- [C#](#c%23) -- [TypeScript](#typescript) -- [Kotlin](#kotlin) -- [PHP](#php) +- [Language examples](#language-examples) + * [Python](#python) + * [JavaScript](#javascript) + * [Java](#java) + * [C#](#c%23) + * [TypeScript](#typescript) + * [Kotlin](#kotlin) + * [PHP](#php) + * [Scala](#scala) + * [Rust](#rust) + * [Dart](#dart) + * [Go](#go) + * [C++](#c) - [Other examples](#other-examples) @@ -65,27 +71,37 @@ These are all the basic generator examples that shows a bare minimal example of - [generate-javascript-models](./generate-javascript-models) - A basic example to generate JavaScript data models - [generate-kotlin-models](./generate-kotlin-models) - A basic example to generate Kotlin data models - [generate-cplusplus-models](./generate-cplusplus-models) - A basic example to generate C++ data models +- [generate-php-models](./generate-cplusplus-models) - A basic example to generate PHP data models +- [generate-scala-models](./generate-cplusplus-models) - A basic example to generate Scala data models ## Integrations These are examples of how you can integrate Modelina into a specific scenario: - [integrate-with-react](./integrate-with-react) - A basic example that shows how you can integrate Modelina with React. - [integrate-with-next](./integrate-with-next) - A basic example that shows how you can integrate Modelina with Next. -- [integrate-modelina-into-maven](./integrate-modelina-into-maven) - A basic example that shows how you can integrate Modelina into the Java Maven build process. +- [integrate-with-maven](./integrate-with-maven) - A basic example that shows how you can integrate Modelina into the Java Maven build process. -## Python +## Language examples +These are all the examples for each language; + +### Python These are all specific examples only relevant to the Python generator: +- [generate-python-models](./generate-python-models) - A basic example showing how to generate Python models. +- [generate-python-complete-models](./generate-python-complete-models) - A basic example showing how to generate complete Python models. - [generate-python-pydantic-models](./generate-python-pydantic-models) - An example showing how to generate Python pydantic models. - [python-generate-json-serializer-and-deseriazlier](./python-generate-json-serializer-and-deserializer) - An example that shows how to generate the models with JSON serializer and deserializer. -## JavaScript +### JavaScript These are all specific examples only relevant to the JavaScript generator: +- [generate-javascript-models](./generate-javascript-models) - A basic example to generate JavaScript data models - [javascript-use-esm](./javascript-use-esm) - A basic example that generate the models to use ESM module system. - [javascript-use-cjs](./javascript-use-cjs) - A basic example that generate the models to use CJS module system. - [javascript-generate-marshalling](./javascript-generate-marshalling) - A basic example of how to use the un/marshalling functionality of the javascript class. - [javascript-generate-example](./javascript-generate-example) - A basic example of how to use Modelina and output a JavaScript class with an example function. -## Java +### Java These are all specific examples only relevant to the Java generator: + +- [generate-java-models](./generate-java-models) - A basic example to generate Java data models. - [java-generate-tostring](./java-generate-tostring) - A basic example that shows how to generate models that overwrite the `toString` method - [java-change-collection-type](./java-change-collection-type) - An example to render collections as List in Java. - [java-generate-hashcode](./java-generate-hashcode) - A basic example that shows how to generate models that overwrite the `hashCode` method @@ -95,10 +111,12 @@ These are all specific examples only relevant to the Java generator: - [java-generate-equals](./java-generate-equals) - A basic example that shows how to generate models that overwrite the `equal` method - [java-generate-javax-constraint-annotation](./java-generate-javax-constraint-annotation) - A basic example that shows how Java data models having `javax.validation.constraints` annotations can be generated. - [java-generate-javadoc](./java-generate-javadoc) - A basic example of how to generate Java models including JavaDocs. -- [integrate-modelina-into-maven](./integrate-modelina-into-maven/) - A basic example that shows how you can integrate Modelina into the Java Maven build process. +- [integrate-into-maven](./integrate-with-maven/) - A basic example that shows how you can integrate Modelina into the Java Maven build process. -## C# +### C# These are all specific examples only relevant to the C# generator: + +- [generate-csharp-models](./generate-csharp-models) - A basic example to generate C# data models - [csharp-generate-equals-and-hashcode](./csharp-generate-equals-and-hashcode) - A basic example on how to generate models that overwrite the `Equal` and `GetHashCode` methods - [csharp-generate-json-serializer](./csharp-generate-json-serializer) - A basic example on how to generate models that include function to serialize the data models to and from JSON with System.Text.Json. - [csharp-generate-newtonsoft-serializer](./csharp-generate-newtonsoft-serializer) - A basic example on how to generate models that include function to serialize the data models to and form JSON with Newtonsoft. @@ -107,8 +125,10 @@ These are all specific examples only relevant to the C# generator: - [csharp-generate-records](./csharp-generate-records) - A basic example that shows how to change C# model type from class to record. - [csharp-generate-handle-nullable](./csharp-generate-handle-nullable) - A basic example that shows how generate code than handles nullable mode and prevent warnings. -## TypeScript +### TypeScript These are all specific examples only relevant to the TypeScript generator: + +- [generate-typescript-models](./generate-typescript-models) - A basic example to generate TypeScript data models - [typescript-interface](./typescript-interface) - A basic TypeScript generator that outputs interfaces. - [typescript-enum-type](./typescript-enum-type) - A basic example of how to use Modelina can output different types of enums in TypeScript. - [typescript-generate-example](./typescript-generate-example) - A basic example of how to use Modelina and output a TypeScript class with an example function. @@ -118,19 +138,46 @@ These are all specific examples only relevant to the TypeScript generator: - [typescript-use-cjs](./typescript-use-cjs) - A basic example that generate the models to use CJS module system. - [typescript-generate-jsonbinpack](./typescript-generate-jsonbinpack) - A basic example showing how to generate models that include [jsonbinpack](https://github.com/sourcemeta/jsonbinpack) functionality. -## Kotlin +### Kotlin These are all specific examples only relevant to the Kotlin generator: + +- [generate-kotlin-models](./generate-kotlin-models) - A basic example to generate Kotlin data models - [generate-kotlin-enums](./generate-kotlin-enums) - [kotlin-generate-kdoc](./kotlin-generate-kdoc) - [kotlin-generate-javax-constraint-annotations](./kotlin-generate-javax-constraint-annotation) - [kotlin-change-collection-type](./kotlin-change-collection-type) -## PHP +### PHP These are all specific examples only relevant to the PHP generator: -- [php-generate-models](./php-generate-models) - A basic example of how to use Modelina and output a PHP class. + +- [generate-php-models](./generate-cplusplus-models) - A basic example to generate PHP data models - [php-generate-complete-models](./php-generate-complete-models) - An example that will output PHP complete class with dependencies and headers. - [php-generate-documentation-preset](./php-generate-documentation-preset) - An example that will output PHP complete class with documentation. +### Scala +These are all specific examples only relevant to the Scala generator: +- [generate-scala-models](./generate-scala-models) - A basic example to generate Scala data models +- [generate-scala-enums](./generate-scala-enums) - A basic example of how to use Modelina and output a Scala enums. +- [scala-generate-documentation](./scala-generate-documentation) - A basic example of how to use Modelina and output a Scala models that include descriptions. + +### Rust +These are all specific examples only relevant to the Rust generator; +- [rust-generate-crate](./rust-generate-crate) - A basic example showing how to generate a Rust package. + +### Dart +These are all specific examples only relevant to the Dart generator: +- [generate-dart-models](./generate-dart-models) - A basic example showing how to generate Python models. +- [dart-generate-json-annotation](./dart-generate-json-annotation) - A basic example of how to use Modelina and output Dart models that include JSON annotations. + +### Go +These are all specific examples only relevant to the Go generator; +- [generate-go-enums](./generate-go-enums) - A basic example showing how to generate a Go enums. +- [generate-go-models](./generate-go-models) - A basic example showing how to generate a Go models. + +### C++ +These are all specific examples only relevant to the C++ generator; +- [generate-cplusplus-models](./generate-cplusplus-models) - A basic example showing how to generate a C++ models. + ## Other examples Miscellaneous examples that do not fit into the otherwise grouping. - [TEMPLATE](./TEMPLATE) - A basic template used to create new examples. diff --git a/examples/custom-logging/package-lock.json b/examples/custom-logging/package-lock.json deleted file mode 100644 index 316a00b194..0000000000 --- a/examples/custom-logging/package-lock.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "custom-logging", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "hasInstallScript": true - } - } -} diff --git a/examples/custom-logging/package.json b/examples/custom-logging/package.json deleted file mode 100644 index cb4b59509c..0000000000 --- a/examples/custom-logging/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "config" : { "example_name" : "custom-logging" }, "scripts": { - "install": "cd ../.. && npm i", - "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", - "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", - "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", - "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" - } -} diff --git a/examples/dart-generate-json-annotation/README.md b/examples/dart-generate-json-annotation/README.md index c4eb09990d..a6a0d256cb 100644 --- a/examples/dart-generate-json-annotation/README.md +++ b/examples/dart-generate-json-annotation/README.md @@ -1,6 +1,6 @@ # Dart Data Models with json_annotation -A basic example of how to use Modelina and output a Go data model. +A basic example of how to use Modelina and output Dart models that include JSON annotations. ## How to run this example diff --git a/examples/integrate-modelina-into-maven/README.md b/examples/integrate-modelina-into-maven/README.md deleted file mode 100644 index 9e266fb740..0000000000 --- a/examples/integrate-modelina-into-maven/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Integrate Modelina into Maven - -This example show how you can integrate Modelina into Maven with a custom build script. [Please have a look at the Maven project README file for further information](./maven-project/README.md). \ No newline at end of file diff --git a/examples/integrate-modelina-into-maven/maven-project/.gitignore b/examples/integrate-modelina-into-maven/maven-project/.gitignore deleted file mode 100644 index fb3e67b746..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ - -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -# https://github.com/takari/maven-wrapper#usage-without-binary-jar -.mvn/wrapper/maven-wrapper.jar - -# Eclipse m2e generated files -# Eclipse Core -.project -# JDT-specific (Eclipse Java Development Tools) -.classpath - -bin -.settings - -# Ignore Modelina generation node modules -scripts/modelina/java_runtime_node -scripts/modelina/node_modules \ No newline at end of file diff --git a/examples/integrate-modelina-into-maven/maven-project/README.md b/examples/integrate-modelina-into-maven/maven-project/README.md deleted file mode 100644 index c736dafd53..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Integrate Modelina into Maven - -This Java Maven project shows an example how to integrate Modelina and AsyncAPI into your build process. - -Here is how it works: -- The script `./scripts/modelina/generate.ts` is what generates all the models, and what Maven uses to generate the models. This can also be executed manually through `npm run generate`. -- The input, in this case, is an AsyncAPI document located in the root of the project `./asyncapi.json`. The input can be anything, just alter the generator script. -- The Maven project file `./pom.xml` then utilizes the [frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) to execute the generate script on build so you will always have the up to date models from your AsyncAPI document. - -> NOTICE: The only thing you manually have to change for this to work in your project is the dependency entry for `"@asyncapi/modelina": "file:../../../../../",` in the `./scripts/modelina/package.json` file to use the latest Modelina version (we only use a local one for testing purposes). \ No newline at end of file diff --git a/examples/integrate-modelina-into-maven/maven-project/asyncapi.json b/examples/integrate-modelina-into-maven/maven-project/asyncapi.json deleted file mode 100644 index e91f2fa683..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/asyncapi.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "asyncapi": "2.2.0", - "info": { - "title": "example", - "version": "0.1.0" - }, - "channels": { - "/test": { - "subscribe": { - "message": { - "payload": { - "$schema": "http://json-schema.org/draft-07/schema#", - "type": "object", - "additionalProperties": false, - "properties": { - "email": { - "type": "string", - "format": "email" - } - } - } - } - } - } - } -} diff --git a/examples/integrate-modelina-into-maven/maven-project/pom.xml b/examples/integrate-modelina-into-maven/maven-project/pom.xml deleted file mode 100644 index a5ccadddec..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - 4.0.0 - - com.mycompany.app - maven-project - 1.0-SNAPSHOT - - maven-project - http://www.example.com - - - UTF-8 - 1.8 - 1.8 - - - - - junit - junit - 4.11 - test - - - - com.fasterxml.jackson.core - jackson-annotations - 2.15.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.15.0 - - - - org.hamcrest - hamcrest-all - 1.3 - test - - - - - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - com.github.eirslett - frontend-maven-plugin - 1.12.1 - - ./scripts/modelina - java_runtime_node - - - - - install node and npm - generate-sources - - install-node-and-npm - - - v18.15.0 - - - - Generate sources - generate-sources - - npm - - - run generate - - - - - - - diff --git a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/generate.ts b/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/generate.ts deleted file mode 100644 index 379703d4a2..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/generate.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { JAVA_JACKSON_PRESET, JavaFileGenerator } from '@asyncapi/modelina'; -import path from 'path'; - -// Where should the models be placed relative to root maven project? -const PACKAGE_NAME = 'java/com/mycompany/app'; -const MODEL_DIR = `src/main/${PACKAGE_NAME}`; - -const FINAL_OUTPUT_PATH = path.resolve(__dirname, '../../', MODEL_DIR); -// Setup the generator and all it's configurations -const generator = new JavaFileGenerator({ - presets: [JAVA_JACKSON_PRESET] -}); - -// Load the input from file, memory, or remotely. -// Here we just use a local AsyncAPI file -import INPUT from '../../asyncapi.json'; -const input = INPUT; - -// Generate all the files -generator.generateToFiles(input, FINAL_OUTPUT_PATH, { - packageName: 'com.mycompany.app' -}); diff --git a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package-lock.json b/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package-lock.json deleted file mode 100644 index 506cfc5437..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package-lock.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "name": "modelina", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "dependencies": { - "@asyncapi/modelina": "file:../../../../../", - "ts-node": "^10.3.0" - } - }, - "../../../..": { - "extraneous": true - }, - "../../../../..": { - "name": "@asyncapi/modelina", - "version": "2.0.1", - "license": "Apache-2.0", - "dependencies": { - "@apidevtools/json-schema-ref-parser": "^9.0.9", - "@apidevtools/swagger-parser": "^10.0.3", - "@asyncapi/avro-schema-parser": "^3.0.2", - "@asyncapi/openapi-schema-parser": "^3.0.5", - "@asyncapi/parser": "^2.1.0", - "@asyncapi/raml-dt-schema-parser": "^4.0.4", - "@swc/core": "^1.3.5", - "@swc/jest": "^0.2.23", - "@types/node": "^20.3.3", - "alterschema": "^1.1.2", - "change-case": "^4.1.2", - "cross-env": "^7.0.3", - "openapi-types": "9.3.0", - "typescript-json-schema": "^0.58.1" - }, - "devDependencies": { - "@asyncapi/parserV1": "npm:@asyncapi/parser@^1.17.2", - "@types/jest": "^27.0.2", - "@typescript-eslint/eslint-plugin": "^6.7.5", - "@typescript-eslint/parser": "^6.7.5", - "ajv": "^8.6.3", - "concurrently": "^7.5.0", - "eslint": "^8.51.0", - "eslint-config-prettier": "9.0.0", - "eslint-plugin-github": "^4.10.1", - "eslint-plugin-jest": "^27.2.1", - "eslint-plugin-prettier": "^5.0.1", - "eslint-plugin-security": "^1.7.1", - "eslint-plugin-sonarjs": "^0.19.0", - "jest": "^27.2.5", - "markdown-toc": "^1.2.0", - "ts-jest": "^27.0.5", - "ts-node": "^10.3.0", - "typedoc": "^0.24.8", - "typescript": "4.9.5" - }, - "engines": { - "node": ">=18" - } - }, - "node_modules/@asyncapi/modelina": { - "resolved": "../../../../..", - "link": true - }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", - "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", - "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, - "node_modules/@tsconfig/node10": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", - "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", - "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", - "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", - "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==" - }, - "node_modules/@types/node": { - "version": "20.8.8", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.8.tgz", - "integrity": "sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ==", - "peer": true, - "dependencies": { - "undici-types": "~5.25.1" - } - }, - "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", - "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/arg": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", - "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" - }, - "node_modules/create-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", - "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" - }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/make-error": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", - "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" - }, - "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/undici-types": { - "version": "5.25.3", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", - "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", - "peer": true - }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", - "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" - }, - "node_modules/yn": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", - "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "engines": { - "node": ">=6" - } - } - } -} diff --git a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package.json b/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package.json deleted file mode 100644 index 9a4203ab4a..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/scripts/modelina/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "@asyncapi/modelina": "file:../../../../../", - "ts-node": "^10.3.0" - }, - "scripts": { - "generate": "./node_modules/.bin/ts-node ./generate.ts", - "generate:windows": "..\\node_modules\\.bin\\ts-node .%\\generate.ts" - } -} diff --git a/examples/integrate-modelina-into-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java b/examples/integrate-modelina-into-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java deleted file mode 100644 index 499cb7f448..0000000000 --- a/examples/integrate-modelina-into-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.mycompany.app; - -import com.fasterxml.jackson.annotation.*; -public class AnonymousSchema_1 { - @JsonProperty("email") - @JsonInclude(JsonInclude.Include.NON_NULL) - private String email; - - public String getEmail() { return this.email; } - public void setEmail(String email) { this.email = email; } -} \ No newline at end of file diff --git a/examples/integrate-modelina-into-maven/package-lock.json b/examples/integrate-modelina-into-maven/package-lock.json deleted file mode 100644 index 925777425c..0000000000 --- a/examples/integrate-modelina-into-maven/package-lock.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "integrate-modelina-into-maven", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "hasInstallScript": true - } - } -} diff --git a/examples/integrate-modelina-into-maven/package.json b/examples/integrate-modelina-into-maven/package.json deleted file mode 100644 index 1425f5cf7d..0000000000 --- a/examples/integrate-modelina-into-maven/package.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "config": { - "example_name": "integrate-modelina-into-maven" - }, - "scripts": { - "install": "(cd ../.. && npm i) && cd maven-project/scripts/modelina && npm i", - "start": "cd ./maven-project/scripts/modelina && npm run generate", - "start:windows": "cd ./maven-project/scripts/modelina && npm run generate:windows", - "test": "npm run start", - "test:windows": "npm run start:windows" - } -} diff --git a/examples/php-generate-models/README.md b/examples/php-generate-models/README.md deleted file mode 100644 index 79f6a36931..0000000000 --- a/examples/php-generate-models/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# PHP Generate Models Example - -A basic example of how to use Modelina and output PHP model. - -## How to run this example - -Run this example using: - -```sh -npm i && npm run start -``` - -If you are on Windows, use the `start:windows` script instead: - -```sh -npm i && npm run start:windows -``` diff --git a/examples/php-generate-models/__snapshots__/index.spec.ts.snap b/examples/php-generate-models/__snapshots__/index.spec.ts.snap deleted file mode 100644 index 6558ebd4f6..0000000000 --- a/examples/php-generate-models/__snapshots__/index.spec.ts.snap +++ /dev/null @@ -1,14 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Should be able to render PHP and should log expected output to console 1`] = ` -Array [ - "final class Root -{ - private ?string $email; - - public function getEmail(): ?string { return $this->email; } - public function setEmail(?string $email): void { $this->email = $email; } -} -", -] -`; diff --git a/examples/php-generate-models/index.spec.ts b/examples/php-generate-models/index.spec.ts deleted file mode 100644 index 04cdadefcc..0000000000 --- a/examples/php-generate-models/index.spec.ts +++ /dev/null @@ -1,15 +0,0 @@ -const spy = jest.spyOn(global.console, 'log').mockImplementation(() => { - return; -}); -import { generate } from './index'; - -describe('Should be able to render PHP', () => { - afterAll(() => { - jest.restoreAllMocks(); - }); - test('and should log expected output to console', async () => { - await generate(); - expect(spy.mock.calls.length).toEqual(1); - expect(spy.mock.calls[0]).toMatchSnapshot(); - }); -}); diff --git a/examples/php-generate-models/index.ts b/examples/php-generate-models/index.ts deleted file mode 100644 index 76cc7cbd64..0000000000 --- a/examples/php-generate-models/index.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { OutputModel, PhpGenerator } from '../../src'; - -const generator: PhpGenerator = new PhpGenerator(); -const jsonSchemaDraft7 = { - $schema: 'http://json-schema.org/draft-07/schema#', - type: 'object', - additionalProperties: false, - properties: { - email: { - type: 'string', - format: 'email' - } - } -}; - -export async function generate(): Promise { - const models: OutputModel[] = await generator.generate(jsonSchemaDraft7); - for (const model of models) { - console.log(model.result); - } -} -if (require.main === module) { - generate(); -} diff --git a/examples/php-generate-models/package-lock.json b/examples/php-generate-models/package-lock.json deleted file mode 100644 index 30824634e7..0000000000 --- a/examples/php-generate-models/package-lock.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "php-generate-models", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "hasInstallScript": true - } - } -} diff --git a/examples/php-generate-models/package.json b/examples/php-generate-models/package.json deleted file mode 100644 index 02e50fb290..0000000000 --- a/examples/php-generate-models/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "config" : { "example_name" : "php-generate-models" }, - "scripts": { - "install": "cd ../.. && npm i", - "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", - "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", - "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", - "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" - } -} diff --git a/jest.config.js b/jest.config.js index 78d5ad22d0..4e6ff5d0a0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -11,7 +11,7 @@ module.exports = { // Test spec file resolution pattern // Matches parent folder `__tests__` and filename // should contain `test` or `spec`. - testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.[jt]sx?$', + testRegex: '((\\.|/)(test|spec))\\.[jt]sx?$', // Module file extensions for importing moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], testTimeout: 10000, diff --git a/modelina-website/scripts/build-examples.js b/modelina-website/scripts/build-examples.js index 1caa89c799..8097bea769 100644 --- a/modelina-website/scripts/build-examples.js +++ b/modelina-website/scripts/build-examples.js @@ -31,7 +31,7 @@ const nameMapping = [ const examplesToIgnore = [ 'integrate-with-react', 'integrate-with-next', - 'integrate-modelina-into-maven', + 'integrate-with-maven', 'TEMPLATE' ] diff --git a/package.json b/package.json index 533b73147a..32f587c203 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "docker:test:blackbox": "docker compose run modelina npm run test:blackbox", "test": "npm run test:library && npm run test:examples", "test:update": "npm run test:library -- -u && npm run test:examples:update", - "test:library": "cross-env CI=true jest --coverage --testPathIgnorePatterns ./test/blackbox --testPathIgnorePatterns ./test/runtime --testPathIgnorePatterns ./examples", + "test:library": "cross-env CI=true jest --coverage --testPathIgnorePatterns ./test/blackbox --testPathIgnorePatterns ./modelina-website --testPathIgnorePatterns ./test/runtime --testPathIgnorePatterns ./examples", "test:examples": "npm run test:examples:regular && npm run test:examples:websites", "test:examples:update": "npm run test:examples:regular -- -u && npm run test:examples:websites -- -u", "test:examples:regular": "cross-env CI=true jest ./examples --testPathIgnorePatterns ./examples/integrate-with-react --testPathIgnorePatterns ./examples/integrate-with-next", @@ -123,7 +123,7 @@ "lint": "eslint --max-warnings 0 --config .eslintrc .", "lint:fix": "eslint --max-warnings 0 --config .eslintrc . --fix", "release": "semantic-release", - "generate:readme:toc": "markdown-toc -i README.md && markdown-toc -i ./docs/other-tools.md && markdown-toc -i ./docs/languages/Php.md && markdown-toc -i ./docs/languages/Cplusplus.md && markdown-toc -i ./examples/README.md && markdown-toc -i ./docs/languages/Python.md && markdown-toc -i ./docs/usage.md && markdown-toc -i ./docs/integration.md && markdown-toc -i ./docs/advanced.md && markdown-toc -i ./docs/languages/Dart.md && markdown-toc -i ./docs/languages/TypeScript.md && markdown-toc -i ./docs/languages/Java.md && markdown-toc -i ./docs/languages/JavaScript.md && markdown-toc -i ./docs/languages/Csharp.md && markdown-toc -i ./docs/README.md && markdown-toc -i ./docs/generators.md && markdown-toc -i ./docs/presets.md", + "generate:readme:toc": "markdown-toc -i README.md && markdown-toc -i ./docs/other-tools.md && markdown-toc -i ./docs/languages/Scala.md && markdown-toc -i ./docs/languages/Php.md && markdown-toc -i ./docs/languages/Cplusplus.md && markdown-toc -i ./examples/README.md && markdown-toc -i ./docs/languages/Python.md && markdown-toc -i ./docs/usage.md && markdown-toc -i ./docs/integration.md && markdown-toc -i ./docs/advanced.md && markdown-toc -i ./docs/languages/Dart.md && markdown-toc -i ./docs/languages/TypeScript.md && markdown-toc -i ./docs/languages/Java.md && markdown-toc -i ./docs/languages/JavaScript.md && markdown-toc -i ./docs/languages/Csharp.md && markdown-toc -i ./docs/README.md && markdown-toc -i ./docs/generators.md && markdown-toc -i ./docs/presets.md", "generate:assets": "npm run build:prod && npm run docs && npm run generate:readme:toc && npm run format", "bump:version": "npm --no-git-tag-version --allow-same-version version $VERSION", "prepublishOnly": "npm run build:prod && npm run generate:readme:toc && npm run format", diff --git a/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap b/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap index 4f35c47b35..1d490ecb96 100644 --- a/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap +++ b/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap @@ -1510,7 +1510,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -1943,7 +1943,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "semver": Object { @@ -3476,7 +3476,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -3909,7 +3909,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "semver": Object { @@ -4027,7 +4027,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -4084,7 +4084,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "semver": Object { @@ -4202,7 +4202,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -4259,7 +4259,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 1, + "x-parser-api-version": 2, "x-parser-spec-parsed": true, }, "semver": Object { From cc76c51b4e7181b0e0c40363b5a3b5420364dd68 Mon Sep 17 00:00:00 2001 From: Jonas Lagoni Date: Mon, 25 Dec 2023 06:51:02 -1000 Subject: [PATCH 2/3] update examples --- docs/languages/Scala.md | 36 +++ examples/custom-logging/package-lock.json | 10 + examples/custom-logging/package.json | 9 + .../package-lock.json | 10 + .../package.json | 9 + examples/generate-php-models/README.md | 17 ++ .../__snapshots__/index.spec.ts.snap | 14 + examples/generate-php-models/index.spec.ts | 15 ++ examples/generate-php-models/index.ts | 24 ++ .../generate-php-models/package-lock.json | 10 + examples/generate-php-models/package.json | 10 + .../__snapshots__/index.spec.ts.snap | 14 + .../__snapshots__/index.spec.ts.snap | 11 + examples/integrate-with-maven/README.md | 3 + .../maven-project/.gitignore | 25 ++ .../maven-project/README.md | 10 + .../maven-project/asyncapi.json | 26 ++ .../maven-project/pom.xml | 113 ++++++++ .../scripts/modelina/generate.ts | 22 ++ .../scripts/modelina/package-lock.json | 243 ++++++++++++++++++ .../scripts/modelina/package.json | 10 + .../com/mycompany/app/AnonymousSchema_1.java | 11 + .../integrate-with-maven/package-lock.json | 10 + examples/integrate-with-maven/package.json | 12 + .../scala-generate-documentation/README.md | 15 ++ .../__snapshots__/index.spec.ts.snap | 17 ++ .../index.spec.ts | 15 ++ .../scala-generate-documentation/index.ts | 28 ++ .../package-lock.json | 10 + .../scala-generate-documentation/package.json | 10 + .../AsyncAPIInputProcessor.spec.ts.snap | 16 +- 31 files changed, 777 insertions(+), 8 deletions(-) create mode 100644 docs/languages/Scala.md create mode 100644 examples/custom-logging/package-lock.json create mode 100644 examples/custom-logging/package.json create mode 100644 examples/dart-generate-json-annotation/package-lock.json create mode 100644 examples/dart-generate-json-annotation/package.json create mode 100644 examples/generate-php-models/README.md create mode 100644 examples/generate-php-models/__snapshots__/index.spec.ts.snap create mode 100644 examples/generate-php-models/index.spec.ts create mode 100644 examples/generate-php-models/index.ts create mode 100644 examples/generate-php-models/package-lock.json create mode 100644 examples/generate-php-models/package.json create mode 100644 examples/generate-scala-enums/__snapshots__/index.spec.ts.snap create mode 100644 examples/generate-scala-models/__snapshots__/index.spec.ts.snap create mode 100644 examples/integrate-with-maven/README.md create mode 100644 examples/integrate-with-maven/maven-project/.gitignore create mode 100644 examples/integrate-with-maven/maven-project/README.md create mode 100644 examples/integrate-with-maven/maven-project/asyncapi.json create mode 100644 examples/integrate-with-maven/maven-project/pom.xml create mode 100644 examples/integrate-with-maven/maven-project/scripts/modelina/generate.ts create mode 100644 examples/integrate-with-maven/maven-project/scripts/modelina/package-lock.json create mode 100644 examples/integrate-with-maven/maven-project/scripts/modelina/package.json create mode 100644 examples/integrate-with-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java create mode 100644 examples/integrate-with-maven/package-lock.json create mode 100644 examples/integrate-with-maven/package.json create mode 100644 examples/scala-generate-documentation/README.md create mode 100644 examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap create mode 100644 examples/scala-generate-documentation/index.spec.ts create mode 100644 examples/scala-generate-documentation/index.ts create mode 100644 examples/scala-generate-documentation/package-lock.json create mode 100644 examples/scala-generate-documentation/package.json diff --git a/docs/languages/Scala.md b/docs/languages/Scala.md new file mode 100644 index 0000000000..249be7b0df --- /dev/null +++ b/docs/languages/Scala.md @@ -0,0 +1,36 @@ +# Scala + +There are special use-cases that each language supports; this document pertains to **Scala models**. + + + + + +- [Description Present](#description-present) +- [Generate serializer and deserializer functionality](#generate-serializer-and-deserializer-functionality) + * [To and from JSON](#to-and-from-json) + * [To and from XML](#to-and-from-xml) + * [To and from binary](#to-and-from-binary) + + + +## Description Present + +By default, descriptions are not rendered for the model; you can change that by applying `SCALA_DESCRIPTION_PRESET`. + +Check out this [example for a live demonstration](../../examples/php-generate-documentation-preset). + +## Generate serializer and deserializer functionality + +The most widely used usecase for Modelina is to generate models that include serilization and deserialization functionality to convert the models into payload data. This payload data can of course be many different kinds, JSON, XML, raw binary, you name it. + +As you normally only need one library to do this, we developers can never get enough with creating new stuff, therefore there might be one specific library you need or want to integrate with. Therefore there is not one specific preset that offers everything. Below is a list of all the supported serialization presets. + +### To and from JSON +Currently not supported, [let everyone know you need it](https://github.com/asyncapi/modelina/issues/new?assignees=&labels=enhancement&template=enhancement.md)! + +### To and from XML +Currently not supported, [let everyone know you need it](https://github.com/asyncapi/modelina/issues/new?assignees=&labels=enhancement&template=enhancement.md)! + +### To and from binary +Currently not supported, [let everyone know you need it](https://github.com/asyncapi/modelina/issues/new?assignees=&labels=enhancement&template=enhancement.md)! diff --git a/examples/custom-logging/package-lock.json b/examples/custom-logging/package-lock.json new file mode 100644 index 0000000000..316a00b194 --- /dev/null +++ b/examples/custom-logging/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "custom-logging", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "hasInstallScript": true + } + } +} diff --git a/examples/custom-logging/package.json b/examples/custom-logging/package.json new file mode 100644 index 0000000000..cb4b59509c --- /dev/null +++ b/examples/custom-logging/package.json @@ -0,0 +1,9 @@ +{ + "config" : { "example_name" : "custom-logging" }, "scripts": { + "install": "cd ../.. && npm i", + "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", + "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", + "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", + "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" + } +} diff --git a/examples/dart-generate-json-annotation/package-lock.json b/examples/dart-generate-json-annotation/package-lock.json new file mode 100644 index 0000000000..ddc523b671 --- /dev/null +++ b/examples/dart-generate-json-annotation/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "dart-generate-json-annotation", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "hasInstallScript": true + } + } +} diff --git a/examples/dart-generate-json-annotation/package.json b/examples/dart-generate-json-annotation/package.json new file mode 100644 index 0000000000..b835668f31 --- /dev/null +++ b/examples/dart-generate-json-annotation/package.json @@ -0,0 +1,9 @@ +{ + "config" : { "example_name" : "dart-generate-json-annotation" }, "scripts": { + "install": "cd ../.. && npm i", + "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", + "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", + "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", + "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" + } +} diff --git a/examples/generate-php-models/README.md b/examples/generate-php-models/README.md new file mode 100644 index 0000000000..79f6a36931 --- /dev/null +++ b/examples/generate-php-models/README.md @@ -0,0 +1,17 @@ +# PHP Generate Models Example + +A basic example of how to use Modelina and output PHP model. + +## How to run this example + +Run this example using: + +```sh +npm i && npm run start +``` + +If you are on Windows, use the `start:windows` script instead: + +```sh +npm i && npm run start:windows +``` diff --git a/examples/generate-php-models/__snapshots__/index.spec.ts.snap b/examples/generate-php-models/__snapshots__/index.spec.ts.snap new file mode 100644 index 0000000000..6558ebd4f6 --- /dev/null +++ b/examples/generate-php-models/__snapshots__/index.spec.ts.snap @@ -0,0 +1,14 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Should be able to render PHP and should log expected output to console 1`] = ` +Array [ + "final class Root +{ + private ?string $email; + + public function getEmail(): ?string { return $this->email; } + public function setEmail(?string $email): void { $this->email = $email; } +} +", +] +`; diff --git a/examples/generate-php-models/index.spec.ts b/examples/generate-php-models/index.spec.ts new file mode 100644 index 0000000000..04cdadefcc --- /dev/null +++ b/examples/generate-php-models/index.spec.ts @@ -0,0 +1,15 @@ +const spy = jest.spyOn(global.console, 'log').mockImplementation(() => { + return; +}); +import { generate } from './index'; + +describe('Should be able to render PHP', () => { + afterAll(() => { + jest.restoreAllMocks(); + }); + test('and should log expected output to console', async () => { + await generate(); + expect(spy.mock.calls.length).toEqual(1); + expect(spy.mock.calls[0]).toMatchSnapshot(); + }); +}); diff --git a/examples/generate-php-models/index.ts b/examples/generate-php-models/index.ts new file mode 100644 index 0000000000..76cc7cbd64 --- /dev/null +++ b/examples/generate-php-models/index.ts @@ -0,0 +1,24 @@ +import { OutputModel, PhpGenerator } from '../../src'; + +const generator: PhpGenerator = new PhpGenerator(); +const jsonSchemaDraft7 = { + $schema: 'http://json-schema.org/draft-07/schema#', + type: 'object', + additionalProperties: false, + properties: { + email: { + type: 'string', + format: 'email' + } + } +}; + +export async function generate(): Promise { + const models: OutputModel[] = await generator.generate(jsonSchemaDraft7); + for (const model of models) { + console.log(model.result); + } +} +if (require.main === module) { + generate(); +} diff --git a/examples/generate-php-models/package-lock.json b/examples/generate-php-models/package-lock.json new file mode 100644 index 0000000000..30824634e7 --- /dev/null +++ b/examples/generate-php-models/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "php-generate-models", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "hasInstallScript": true + } + } +} diff --git a/examples/generate-php-models/package.json b/examples/generate-php-models/package.json new file mode 100644 index 0000000000..02e50fb290 --- /dev/null +++ b/examples/generate-php-models/package.json @@ -0,0 +1,10 @@ +{ + "config" : { "example_name" : "php-generate-models" }, + "scripts": { + "install": "cd ../.. && npm i", + "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", + "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", + "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", + "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" + } +} diff --git a/examples/generate-scala-enums/__snapshots__/index.spec.ts.snap b/examples/generate-scala-enums/__snapshots__/index.spec.ts.snap new file mode 100644 index 0000000000..bb22915bf8 --- /dev/null +++ b/examples/generate-scala-enums/__snapshots__/index.spec.ts.snap @@ -0,0 +1,14 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Should be able to render Kotlin Enums and should log expected output to console 1`] = ` +Array [ + "object Protocol extends Enumeration { + type Protocol = Value + + val Http: Protocol.Value = Value(\\"HTTP\\") + val Number_1: Protocol.Value = Value(1) + val Https: Protocol.Value = Value(\\"HTTPS\\") + val ReservedTrue: Protocol.Value = Value(\\"true\\") +}", +] +`; diff --git a/examples/generate-scala-models/__snapshots__/index.spec.ts.snap b/examples/generate-scala-models/__snapshots__/index.spec.ts.snap new file mode 100644 index 0000000000..ec03215492 --- /dev/null +++ b/examples/generate-scala-models/__snapshots__/index.spec.ts.snap @@ -0,0 +1,11 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Should be able to render Kotlin Models and should log expected output to console 1`] = ` +Array [ + "case class Root( + email: Option[String], + cache: Option[Int], + website: Option[Website], +)", +] +`; diff --git a/examples/integrate-with-maven/README.md b/examples/integrate-with-maven/README.md new file mode 100644 index 0000000000..9e266fb740 --- /dev/null +++ b/examples/integrate-with-maven/README.md @@ -0,0 +1,3 @@ +# Integrate Modelina into Maven + +This example show how you can integrate Modelina into Maven with a custom build script. [Please have a look at the Maven project README file for further information](./maven-project/README.md). \ No newline at end of file diff --git a/examples/integrate-with-maven/maven-project/.gitignore b/examples/integrate-with-maven/maven-project/.gitignore new file mode 100644 index 0000000000..fb3e67b746 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/.gitignore @@ -0,0 +1,25 @@ + +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +# https://github.com/takari/maven-wrapper#usage-without-binary-jar +.mvn/wrapper/maven-wrapper.jar + +# Eclipse m2e generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath + +bin +.settings + +# Ignore Modelina generation node modules +scripts/modelina/java_runtime_node +scripts/modelina/node_modules \ No newline at end of file diff --git a/examples/integrate-with-maven/maven-project/README.md b/examples/integrate-with-maven/maven-project/README.md new file mode 100644 index 0000000000..c736dafd53 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/README.md @@ -0,0 +1,10 @@ +# Integrate Modelina into Maven + +This Java Maven project shows an example how to integrate Modelina and AsyncAPI into your build process. + +Here is how it works: +- The script `./scripts/modelina/generate.ts` is what generates all the models, and what Maven uses to generate the models. This can also be executed manually through `npm run generate`. +- The input, in this case, is an AsyncAPI document located in the root of the project `./asyncapi.json`. The input can be anything, just alter the generator script. +- The Maven project file `./pom.xml` then utilizes the [frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) to execute the generate script on build so you will always have the up to date models from your AsyncAPI document. + +> NOTICE: The only thing you manually have to change for this to work in your project is the dependency entry for `"@asyncapi/modelina": "file:../../../../../",` in the `./scripts/modelina/package.json` file to use the latest Modelina version (we only use a local one for testing purposes). \ No newline at end of file diff --git a/examples/integrate-with-maven/maven-project/asyncapi.json b/examples/integrate-with-maven/maven-project/asyncapi.json new file mode 100644 index 0000000000..e91f2fa683 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/asyncapi.json @@ -0,0 +1,26 @@ +{ + "asyncapi": "2.2.0", + "info": { + "title": "example", + "version": "0.1.0" + }, + "channels": { + "/test": { + "subscribe": { + "message": { + "payload": { + "$schema": "http://json-schema.org/draft-07/schema#", + "type": "object", + "additionalProperties": false, + "properties": { + "email": { + "type": "string", + "format": "email" + } + } + } + } + } + } + } +} diff --git a/examples/integrate-with-maven/maven-project/pom.xml b/examples/integrate-with-maven/maven-project/pom.xml new file mode 100644 index 0000000000..a5ccadddec --- /dev/null +++ b/examples/integrate-with-maven/maven-project/pom.xml @@ -0,0 +1,113 @@ + + + + 4.0.0 + + com.mycompany.app + maven-project + 1.0-SNAPSHOT + + maven-project + http://www.example.com + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 4.11 + test + + + + com.fasterxml.jackson.core + jackson-annotations + 2.15.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.15.0 + + + + org.hamcrest + hamcrest-all + 1.3 + test + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + com.github.eirslett + frontend-maven-plugin + 1.12.1 + + ./scripts/modelina + java_runtime_node + + + + + install node and npm + generate-sources + + install-node-and-npm + + + v18.15.0 + + + + Generate sources + generate-sources + + npm + + + run generate + + + + + + + diff --git a/examples/integrate-with-maven/maven-project/scripts/modelina/generate.ts b/examples/integrate-with-maven/maven-project/scripts/modelina/generate.ts new file mode 100644 index 0000000000..379703d4a2 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/scripts/modelina/generate.ts @@ -0,0 +1,22 @@ +import { JAVA_JACKSON_PRESET, JavaFileGenerator } from '@asyncapi/modelina'; +import path from 'path'; + +// Where should the models be placed relative to root maven project? +const PACKAGE_NAME = 'java/com/mycompany/app'; +const MODEL_DIR = `src/main/${PACKAGE_NAME}`; + +const FINAL_OUTPUT_PATH = path.resolve(__dirname, '../../', MODEL_DIR); +// Setup the generator and all it's configurations +const generator = new JavaFileGenerator({ + presets: [JAVA_JACKSON_PRESET] +}); + +// Load the input from file, memory, or remotely. +// Here we just use a local AsyncAPI file +import INPUT from '../../asyncapi.json'; +const input = INPUT; + +// Generate all the files +generator.generateToFiles(input, FINAL_OUTPUT_PATH, { + packageName: 'com.mycompany.app' +}); diff --git a/examples/integrate-with-maven/maven-project/scripts/modelina/package-lock.json b/examples/integrate-with-maven/maven-project/scripts/modelina/package-lock.json new file mode 100644 index 0000000000..506cfc5437 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/scripts/modelina/package-lock.json @@ -0,0 +1,243 @@ +{ + "name": "modelina", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "dependencies": { + "@asyncapi/modelina": "file:../../../../../", + "ts-node": "^10.3.0" + } + }, + "../../../..": { + "extraneous": true + }, + "../../../../..": { + "name": "@asyncapi/modelina", + "version": "2.0.1", + "license": "Apache-2.0", + "dependencies": { + "@apidevtools/json-schema-ref-parser": "^9.0.9", + "@apidevtools/swagger-parser": "^10.0.3", + "@asyncapi/avro-schema-parser": "^3.0.2", + "@asyncapi/openapi-schema-parser": "^3.0.5", + "@asyncapi/parser": "^2.1.0", + "@asyncapi/raml-dt-schema-parser": "^4.0.4", + "@swc/core": "^1.3.5", + "@swc/jest": "^0.2.23", + "@types/node": "^20.3.3", + "alterschema": "^1.1.2", + "change-case": "^4.1.2", + "cross-env": "^7.0.3", + "openapi-types": "9.3.0", + "typescript-json-schema": "^0.58.1" + }, + "devDependencies": { + "@asyncapi/parserV1": "npm:@asyncapi/parser@^1.17.2", + "@types/jest": "^27.0.2", + "@typescript-eslint/eslint-plugin": "^6.7.5", + "@typescript-eslint/parser": "^6.7.5", + "ajv": "^8.6.3", + "concurrently": "^7.5.0", + "eslint": "^8.51.0", + "eslint-config-prettier": "9.0.0", + "eslint-plugin-github": "^4.10.1", + "eslint-plugin-jest": "^27.2.1", + "eslint-plugin-prettier": "^5.0.1", + "eslint-plugin-security": "^1.7.1", + "eslint-plugin-sonarjs": "^0.19.0", + "jest": "^27.2.5", + "markdown-toc": "^1.2.0", + "ts-jest": "^27.0.5", + "ts-node": "^10.3.0", + "typedoc": "^0.24.8", + "typescript": "4.9.5" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@asyncapi/modelina": { + "resolved": "../../../../..", + "link": true + }, + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==" + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dependencies": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==" + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==" + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==" + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz", + "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==" + }, + "node_modules/@types/node": { + "version": "20.8.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.8.tgz", + "integrity": "sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ==", + "peer": true, + "dependencies": { + "undici-types": "~5.25.1" + } + }, + "node_modules/acorn": { + "version": "8.10.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", + "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/arg": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==" + }, + "node_modules/create-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", + "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" + }, + "node_modules/diff": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==" + }, + "node_modules/ts-node": { + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", + "arg": "^4.1.0", + "create-require": "^1.1.0", + "diff": "^4.0.1", + "make-error": "^1.1.1", + "v8-compile-cache-lib": "^3.0.1", + "yn": "3.1.1" + }, + "bin": { + "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", + "ts-node-script": "dist/bin-script.js", + "ts-node-transpile-only": "dist/bin-transpile.js", + "ts-script": "dist/bin-script-deprecated.js" + }, + "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", + "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } + } + }, + "node_modules/typescript": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, + "node_modules/undici-types": { + "version": "5.25.3", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz", + "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==", + "peer": true + }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==" + }, + "node_modules/yn": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", + "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", + "engines": { + "node": ">=6" + } + } + } +} diff --git a/examples/integrate-with-maven/maven-project/scripts/modelina/package.json b/examples/integrate-with-maven/maven-project/scripts/modelina/package.json new file mode 100644 index 0000000000..9a4203ab4a --- /dev/null +++ b/examples/integrate-with-maven/maven-project/scripts/modelina/package.json @@ -0,0 +1,10 @@ +{ + "dependencies": { + "@asyncapi/modelina": "file:../../../../../", + "ts-node": "^10.3.0" + }, + "scripts": { + "generate": "./node_modules/.bin/ts-node ./generate.ts", + "generate:windows": "..\\node_modules\\.bin\\ts-node .%\\generate.ts" + } +} diff --git a/examples/integrate-with-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java b/examples/integrate-with-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java new file mode 100644 index 0000000000..499cb7f448 --- /dev/null +++ b/examples/integrate-with-maven/maven-project/src/main/java/com/mycompany/app/AnonymousSchema_1.java @@ -0,0 +1,11 @@ +package com.mycompany.app; + +import com.fasterxml.jackson.annotation.*; +public class AnonymousSchema_1 { + @JsonProperty("email") + @JsonInclude(JsonInclude.Include.NON_NULL) + private String email; + + public String getEmail() { return this.email; } + public void setEmail(String email) { this.email = email; } +} \ No newline at end of file diff --git a/examples/integrate-with-maven/package-lock.json b/examples/integrate-with-maven/package-lock.json new file mode 100644 index 0000000000..1caacfbbed --- /dev/null +++ b/examples/integrate-with-maven/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "integrate-with-maven", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "hasInstallScript": true + } + } +} diff --git a/examples/integrate-with-maven/package.json b/examples/integrate-with-maven/package.json new file mode 100644 index 0000000000..6e1edf3e3b --- /dev/null +++ b/examples/integrate-with-maven/package.json @@ -0,0 +1,12 @@ +{ + "config": { + "example_name": "integrate-with-maven" + }, + "scripts": { + "install": "(cd ../.. && npm i) && cd maven-project/scripts/modelina && npm i", + "start": "cd ./maven-project/scripts/modelina && npm run generate", + "start:windows": "cd ./maven-project/scripts/modelina && npm run generate:windows", + "test": "npm run start", + "test:windows": "npm run start:windows" + } +} diff --git a/examples/scala-generate-documentation/README.md b/examples/scala-generate-documentation/README.md new file mode 100644 index 0000000000..0f8e70eae4 --- /dev/null +++ b/examples/scala-generate-documentation/README.md @@ -0,0 +1,15 @@ +# PHP Generate Models With Documentation Preset + +## How to run this example + +Run this example using: + +```sh +npm i && npm run start +``` + +If you are on Windows, use the `start:windows` script instead: + +```sh +npm i && npm run start:windows +``` diff --git a/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap b/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap new file mode 100644 index 0000000000..26372c5b38 --- /dev/null +++ b/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Should be able to render PHP and should log expected output to console 1`] = ` +Array [ + "/** + * Description for class + */ +final class Root +{ + private ?string $email; + + public function getEmail(): ?string { return $this->email; } + public function setEmail(?string $email): void { $this->email = $email; } +} +", +] +`; diff --git a/examples/scala-generate-documentation/index.spec.ts b/examples/scala-generate-documentation/index.spec.ts new file mode 100644 index 0000000000..04cdadefcc --- /dev/null +++ b/examples/scala-generate-documentation/index.spec.ts @@ -0,0 +1,15 @@ +const spy = jest.spyOn(global.console, 'log').mockImplementation(() => { + return; +}); +import { generate } from './index'; + +describe('Should be able to render PHP', () => { + afterAll(() => { + jest.restoreAllMocks(); + }); + test('and should log expected output to console', async () => { + await generate(); + expect(spy.mock.calls.length).toEqual(1); + expect(spy.mock.calls[0]).toMatchSnapshot(); + }); +}); diff --git a/examples/scala-generate-documentation/index.ts b/examples/scala-generate-documentation/index.ts new file mode 100644 index 0000000000..dc208fc927 --- /dev/null +++ b/examples/scala-generate-documentation/index.ts @@ -0,0 +1,28 @@ +import { PhpGenerator, PHP_DESCRIPTION_PRESET } from '../../src'; + +const generator: PhpGenerator = new PhpGenerator({ + presets: [PHP_DESCRIPTION_PRESET] +}); +const jsonSchemaDraft7 = { + $schema: 'http://json-schema.org/draft-07/schema#', + type: 'object', + additionalProperties: false, + description: 'Description for class', + properties: { + email: { + type: 'string', + format: 'email', + description: 'Description for the email property' + } + } +}; + +export async function generate(): Promise { + const models = await generator.generate(jsonSchemaDraft7); + for (const model of models) { + console.log(model.result); + } +} +if (require.main === module) { + generate(); +} diff --git a/examples/scala-generate-documentation/package-lock.json b/examples/scala-generate-documentation/package-lock.json new file mode 100644 index 0000000000..b9dd7a7fe6 --- /dev/null +++ b/examples/scala-generate-documentation/package-lock.json @@ -0,0 +1,10 @@ +{ + "name": "php-generate-documentation-preset", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "hasInstallScript": true + } + } +} diff --git a/examples/scala-generate-documentation/package.json b/examples/scala-generate-documentation/package.json new file mode 100644 index 0000000000..06d2b0b6e3 --- /dev/null +++ b/examples/scala-generate-documentation/package.json @@ -0,0 +1,10 @@ +{ + "config" : { "example_name" : "php-generate-documentation-preset" }, + "scripts": { + "install": "cd ../.. && npm i", + "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", + "start:windows": "..\\..\\node_modules\\.bin\\ts-node --cwd ..\\..\\ .\\examples\\%npm_package_config_example_name%\\index.ts", + "test": "../../node_modules/.bin/jest --config=../../jest.config.js ./examples/$npm_package_config_example_name/index.spec.ts", + "test:windows": "..\\..\\node_modules\\.bin\\jest --config=..\\..\\jest.config.js examples/%npm_package_config_example_name%/index.spec.ts" + } +} diff --git a/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap b/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap index 1d490ecb96..4f35c47b35 100644 --- a/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap +++ b/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap @@ -1510,7 +1510,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -1943,7 +1943,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "semver": Object { @@ -3476,7 +3476,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -3909,7 +3909,7 @@ InputMetaModel { "title": "CloudEvent example", "version": "1.0.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "semver": Object { @@ -4027,7 +4027,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -4084,7 +4084,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "semver": Object { @@ -4202,7 +4202,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "_meta": Object { @@ -4259,7 +4259,7 @@ InputMetaModel { "title": "Signup service example (internal)", "version": "0.1.0", }, - "x-parser-api-version": 2, + "x-parser-api-version": 1, "x-parser-spec-parsed": true, }, "semver": Object { From 64f82e02b68955173a16344b8ca1262424ea9812 Mon Sep 17 00:00:00 2001 From: Jonas Lagoni Date: Mon, 25 Dec 2023 19:53:53 -1000 Subject: [PATCH 3/3] fix missing exposed generator --- examples/generate-scala-enums/index.ts | 2 +- examples/generate-scala-models/index.ts | 2 +- examples/scala-generate-documentation/README.md | 2 +- .../__snapshots__/index.spec.ts.snap | 15 ++++++--------- .../scala-generate-documentation/index.spec.ts | 2 +- examples/scala-generate-documentation/index.ts | 6 +++--- .../package-lock.json | 2 +- .../scala-generate-documentation/package.json | 2 +- src/generators/index.ts | 1 + 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/examples/generate-scala-enums/index.ts b/examples/generate-scala-enums/index.ts index 458cc94c8d..f7a97fd1c3 100644 --- a/examples/generate-scala-enums/index.ts +++ b/examples/generate-scala-enums/index.ts @@ -1,4 +1,4 @@ -import { ScalaGenerator } from '../../src/generators/scala'; +import { ScalaGenerator } from '../../src'; const generator = new ScalaGenerator(); const jsonSchemaDraft7 = { diff --git a/examples/generate-scala-models/index.ts b/examples/generate-scala-models/index.ts index 74cde5421c..37ce750028 100644 --- a/examples/generate-scala-models/index.ts +++ b/examples/generate-scala-models/index.ts @@ -1,4 +1,4 @@ -import { ScalaGenerator } from '../../src/generators/scala'; +import { ScalaGenerator } from '../../src'; const generator = new ScalaGenerator(); const jsonSchemaDraft7 = { diff --git a/examples/scala-generate-documentation/README.md b/examples/scala-generate-documentation/README.md index 0f8e70eae4..82893d8e30 100644 --- a/examples/scala-generate-documentation/README.md +++ b/examples/scala-generate-documentation/README.md @@ -1,4 +1,4 @@ -# PHP Generate Models With Documentation Preset +# Scala Generate Models With Documentation Preset ## How to run this example diff --git a/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap b/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap index 26372c5b38..e1acc66d66 100644 --- a/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap +++ b/examples/scala-generate-documentation/__snapshots__/index.spec.ts.snap @@ -1,17 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Should be able to render PHP and should log expected output to console 1`] = ` +exports[`Should be able to render Scala models that include documentation and should log expected output to console 1`] = ` Array [ "/** * Description for class + * + * @property email Description for the email property */ -final class Root -{ - private ?string $email; - - public function getEmail(): ?string { return $this->email; } - public function setEmail(?string $email): void { $this->email = $email; } -} -", +case class Root( + email: Option[String], +)", ] `; diff --git a/examples/scala-generate-documentation/index.spec.ts b/examples/scala-generate-documentation/index.spec.ts index 04cdadefcc..62cc087f01 100644 --- a/examples/scala-generate-documentation/index.spec.ts +++ b/examples/scala-generate-documentation/index.spec.ts @@ -3,7 +3,7 @@ const spy = jest.spyOn(global.console, 'log').mockImplementation(() => { }); import { generate } from './index'; -describe('Should be able to render PHP', () => { +describe('Should be able to render Scala models that include documentation', () => { afterAll(() => { jest.restoreAllMocks(); }); diff --git a/examples/scala-generate-documentation/index.ts b/examples/scala-generate-documentation/index.ts index dc208fc927..a5ddc6c493 100644 --- a/examples/scala-generate-documentation/index.ts +++ b/examples/scala-generate-documentation/index.ts @@ -1,7 +1,7 @@ -import { PhpGenerator, PHP_DESCRIPTION_PRESET } from '../../src'; +import { SCALA_DESCRIPTION_PRESET, ScalaGenerator } from '../../src'; -const generator: PhpGenerator = new PhpGenerator({ - presets: [PHP_DESCRIPTION_PRESET] +const generator = new ScalaGenerator({ + presets: [SCALA_DESCRIPTION_PRESET] }); const jsonSchemaDraft7 = { $schema: 'http://json-schema.org/draft-07/schema#', diff --git a/examples/scala-generate-documentation/package-lock.json b/examples/scala-generate-documentation/package-lock.json index b9dd7a7fe6..35603bba82 100644 --- a/examples/scala-generate-documentation/package-lock.json +++ b/examples/scala-generate-documentation/package-lock.json @@ -1,5 +1,5 @@ { - "name": "php-generate-documentation-preset", + "name": "scala-generate-documentation", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/examples/scala-generate-documentation/package.json b/examples/scala-generate-documentation/package.json index 06d2b0b6e3..8d3eaa0b00 100644 --- a/examples/scala-generate-documentation/package.json +++ b/examples/scala-generate-documentation/package.json @@ -1,5 +1,5 @@ { - "config" : { "example_name" : "php-generate-documentation-preset" }, + "config" : { "example_name" : "scala-generate-documentation" }, "scripts": { "install": "cd ../.. && npm i", "start": "../../node_modules/.bin/ts-node --cwd ../../ ./examples/$npm_package_config_example_name/index.ts", diff --git a/src/generators/index.ts b/src/generators/index.ts index 9a76050899..3cad3a112a 100644 --- a/src/generators/index.ts +++ b/src/generators/index.ts @@ -11,4 +11,5 @@ export * from './go'; export * from './rust'; export * from './kotlin'; export * from './cplusplus'; +export * from './scala'; export * from './AbstractFileGenerator';