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';