generator-jhipster 8.3.0 → 8.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generators/angular/generator.js +34 -0
- package/dist/generators/angular/resources/package.json +13 -13
- package/dist/generators/angular/templates/src/main/webapp/app/account/password/password.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.ts.ejs +3 -6
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/account/password-reset/init/password-reset-init.component.ts.ejs +3 -6
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/account/register/register.component.ts.ejs +3 -6
- package/dist/generators/angular/templates/src/main/webapp/app/account/settings/settings.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +11 -11
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +0 -2
- package/dist/generators/angular/templates/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/core/auth/user-route-access.service.ts.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.html.ejs +0 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/detail/_entityFile_-detail.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-form.service.ts.ejs +10 -6
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.spec.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/entities/_entityFolder_/update/_entityFile_-update.component.ts.ejs +11 -17
- package/dist/generators/angular/templates/src/main/webapp/app/home/home.component.html.ejs +6 -6
- package/dist/generators/angular/templates/src/main/webapp/app/layouts/navbar/active-menu.directive.ts.ejs +3 -3
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.html.ejs +1 -1
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/login/login.component.ts.ejs +3 -4
- package/dist/generators/angular/templates/src/main/webapp/app/shared/alert/alert-error.component.spec.ts.ejs +2 -2
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.spec.ts.ejs +10 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/auth/has-any-authority.directive.ts.ejs +3 -8
- package/dist/generators/angular/templates/src/main/webapp/app/shared/filter/filter.component.html.ejs +6 -2
- package/dist/generators/angular/templates/webpack/webpack.custom.js.ejs +1 -1
- package/dist/generators/app/generator.js +6 -33
- package/dist/generators/app/support/config.js +1 -3
- package/dist/generators/base/generator.js +15 -16
- package/dist/generators/base/priorities.js +12 -1
- package/dist/generators/base-application/generator.js +14 -2
- package/dist/generators/base-application/priorities.js +1 -0
- package/dist/generators/base-application/support/prepare-entity.js +7 -8
- package/dist/generators/base-application/support/prepare-field.js +1 -1
- package/dist/generators/base-application/support/prepare-relationship.js +3 -2
- package/dist/generators/base-core/generator.js +45 -11
- package/dist/generators/base-entity-changes/generator.js +24 -0
- package/dist/generators/bootstrap-application-base/generator.js +46 -1
- package/dist/generators/bootstrap-application-server/generator.js +5 -7
- package/dist/generators/ci-cd/generator.js +0 -5
- package/dist/generators/client/command.js +2 -2
- package/dist/generators/client/generator.js +0 -22
- package/dist/generators/client/generators/common/command.js +5 -0
- package/dist/generators/client/generators/common/generator.js +79 -0
- package/dist/generators/{app/prompts.js → client/generators/common/index.js} +2 -15
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/headers.ts.ejs +57 -0
- package/dist/generators/client/generators/common/templates/src/main/webapp/app/shared/jhipster/problem-details.ts.ejs +51 -0
- package/dist/generators/client/resources/package.json +6 -6
- package/dist/generators/client/templates/src/main/webapp/index.html.ejs +1 -1
- package/dist/generators/common/command.js +13 -0
- package/dist/generators/common/generator.js +17 -3
- package/dist/generators/common/resources/package.json +2 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/login-page.cy.ts.ejs +4 -4
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/password-page.cy.ts.ejs +2 -2
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/register-page.cy.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/account/reset-password-page.cy.ts.ejs +1 -1
- package/dist/generators/cypress/templates/src/test/javascript/cypress/e2e/entity/_entity_.cy.ts.ejs +10 -10
- package/dist/generators/docker/templates/docker/mysql.yml.ejs +1 -1
- package/dist/generators/docker/templates/docker/realm-config/jhipster-realm.json.ejs +14 -3
- package/dist/generators/docker-compose/generator.js +1 -5
- package/dist/generators/docker-compose/templates/realm-config/jhipster-realm.json.ejs +14 -3
- package/dist/generators/entity/generator.js +2 -10
- package/dist/generators/entity/prompts.js +6 -11
- package/dist/generators/export-jdl/generator.js +0 -5
- package/dist/generators/gatling/README.md +15 -0
- package/dist/generators/gatling/templates/buildSrc/src/main/groovy/jhipster.gatling-conventions.gradle.ejs +1 -1
- package/dist/generators/gatling/templates/src/test/java/gatling/simulations/_entityClass_GatlingTest.java.ejs +2 -10
- package/dist/generators/generate-blueprint/command.js +16 -0
- package/dist/generators/generate-blueprint/files.js +8 -0
- package/dist/generators/generate-blueprint/generator.js +17 -10
- package/dist/generators/generate-blueprint/resources/package.json +1 -1
- package/dist/generators/generate-blueprint/templates/.blueprint/cli/commands.mjs.ejs +6 -0
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/command.mjs.ejs +20 -0
- package/dist/generators/generate-blueprint/templates/.blueprint/generate-sample/generator.mjs.ejs +9 -13
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/build-matrix.mjs.ejs +22 -0
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/generator.mjs.ejs +24 -0
- package/dist/generators/generate-blueprint/templates/.blueprint/github-build-matrix/index.mjs.ejs +1 -0
- package/dist/generators/generate-blueprint/templates/.eslintrc.json.ejs +2 -2
- package/dist/generators/generate-blueprint/templates/README.md.ejs +16 -8
- package/dist/generators/generate-blueprint/templates/vitest.config.ts.ejs +1 -0
- package/dist/generators/generator-constants.js +1 -1
- package/dist/generators/heroku/generator.js +0 -5
- package/dist/generators/info/generator.js +1 -3
- package/dist/generators/init/generator.js +2 -2
- package/dist/generators/init/resources/.node-version +1 -1
- package/dist/generators/java/generators/build-tool/command.js +4 -1
- package/dist/generators/java/generators/domain/generator.js +16 -0
- package/dist/generators/java/generators/domain/templates/src/main/java/_package_/_entityPackage_/domain/_persistClass_.java.jhi.ejs +1 -5
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Asserts.java.ejs +3 -3
- package/dist/generators/java/generators/domain/templates/src/test/java/_package_/_entityPackage_/domain/_persistClass_Test.java.ejs +3 -3
- package/dist/generators/java/support/add-java-annotation.js +28 -7
- package/dist/generators/java/support/generated-annotation-transform.js +1 -1
- package/dist/generators/java/support/index.js +1 -1
- package/dist/generators/jdl/generator.js +1 -5
- package/dist/generators/kubernetes/files.js +1 -1
- package/dist/generators/kubernetes/generator.js +0 -5
- package/dist/generators/kubernetes/templates/db/mysql.yml.ejs +0 -1
- package/dist/generators/kubernetes/templates/keycloak/keycloak-configmap.yml.ejs +14 -3
- package/dist/generators/kubernetes-helm/generator.js +0 -5
- package/dist/generators/kubernetes-knative/generator.js +0 -5
- package/dist/generators/languages/files.js +2 -2
- package/dist/generators/languages/generator.js +4 -8
- package/dist/generators/languages/templates/src/main/webapp/i18n/al/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ar-ly/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/az-Latn-az/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/bg/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/bn/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/by/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ca/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/cs/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/da/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/global.json.ejs +2 -2
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/el/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/en/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/es/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/et/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fa/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/fr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/gl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hu/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/hy/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/id/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/it/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ja/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ko/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/kr-Latn-kr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/mr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/my/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/nl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pa/{home.json → home.json.ejs} +2 -2
- package/dist/generators/languages/templates/src/main/webapp/i18n/pl/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-br/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-pt/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ro/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ru/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/si/{home.json → home.json.ejs} +6 -6
- package/dist/generators/languages/templates/src/main/webapp/i18n/sk/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/sr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/sv/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ta/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/te/{home.json → home.json.ejs} +1 -1
- package/dist/generators/languages/templates/src/main/webapp/i18n/th/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/tr/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/ua/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/vi/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-cn/home.json.ejs +19 -0
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-tw/home.json.ejs +19 -0
- package/dist/generators/liquibase/generator.js +59 -12
- package/dist/generators/liquibase/support/prepare-field.js +16 -1
- package/dist/generators/liquibase/support/relationship.js +1 -0
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs +1 -1
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity.xml.ejs +3 -3
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/changelog/updated_entity_constraints.xml.ejs +26 -1
- package/dist/generators/liquibase/templates/src/main/resources/config/liquibase/fake-data/table_entity.csv.ejs +3 -3
- package/dist/generators/maven/templates/.mvn/wrapper/maven-wrapper.properties +2 -2
- package/dist/generators/maven/templates/mvnw +185 -243
- package/dist/generators/maven/templates/mvnw.cmd +121 -180
- package/dist/generators/react/generator.js +10 -0
- package/dist/generators/react/resources/package.json +30 -30
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.spec.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/axios-interceptor.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.spec.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/config/notification-middleware.ts.ejs +80 -87
- package/dist/generators/react/templates/src/main/webapp/app/config/store.ts.ejs +1 -1
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.tsx.ejs +3 -3
- package/dist/generators/react/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.reducer.ts.ejs +12 -7
- package/dist/generators/react/templates/src/main/webapp/app/modules/home/home.tsx.ejs +7 -7
- package/dist/generators/react/templates/src/main/webapp/app/shared/reducers/reducer.utils.ts.ejs +2 -3
- package/dist/generators/react/templates/webpack/webpack.microfrontend.js.jhi.react.ejs +0 -8
- package/dist/generators/server/command.js +0 -11
- package/dist/generators/server/generator.js +19 -115
- package/dist/generators/server/jdl/application-definition.js +3 -1
- package/dist/generators/server/resources/Dockerfile +15 -15
- package/dist/generators/server/resources/gradle/libs.versions.toml +12 -10
- package/dist/generators/server/resources/pom.xml +10 -10
- package/dist/generators/server/support/config.js +4 -8
- package/dist/generators/server/support/prepare-entity.js +5 -6
- package/dist/generators/server/support/prepare-field.js +7 -2
- package/dist/generators/server/support/prepare-relationship.js +7 -2
- package/dist/generators/server/support/relationship.js +5 -2
- package/dist/generators/server/templates/build.gradle.ejs +5 -3
- package/dist/generators/server/templates/gradle/profile_dev.gradle.ejs +3 -2
- package/dist/generators/server/templates/gradle/profile_prod.gradle.ejs +3 -2
- package/dist/generators/server/templates/gradle.properties.ejs +1 -1
- package/dist/generators/server/templates/pom.xml.ejs +7 -9
- package/dist/generators/server/templates/src/main/java/_package_/_entityPackage_/service/dto/_dtoClass_.java.ejs +1 -1
- package/dist/generators/server/templates/src/main/java/_package_/config/Constants.java.ejs +0 -2
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs +57 -24
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs +1 -15
- package/dist/generators/server/templates/src/main/java/_package_/config/SecurityJwtConfiguration.java.ejs +0 -20
- package/dist/generators/server/templates/src/main/java/_package_/security/SecurityUtils.java.ejs +65 -5
- package/dist/generators/server/templates/src/main/java/_package_/service/dto/UserDTO.java.ejs +23 -0
- package/dist/generators/server/templates/src/main/java/_package_/service/mapper/UserMapper.java.ejs +8 -4
- package/dist/generators/server/templates/src/main/java/_package_/web/rest/AccountResource_skipUserManagement.java.ejs +43 -9
- package/dist/generators/server/templates/src/main/resources/config/application.yml.ejs +60 -22
- package/dist/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs +1 -1
- package/dist/generators/server/templates/src/main/resources/static/index_microservices.html.ejs +8 -8
- package/dist/generators/server/templates/src/main/resources/swagger/api.yml.ejs +1 -1
- package/dist/generators/server/templates/src/test/java/_package_/security/DomainUserDetailsServiceIT.java.ejs +31 -13
- package/dist/generators/server/templates/src/test/java/_package_/service/mapper/UserMapperTest.java.ejs +84 -17
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT.java.ejs +62 -6
- package/dist/generators/server/templates/src/test/java/_package_/web/rest/AccountResourceIT_oauth2.java.ejs +22 -0
- package/dist/generators/server/templates/src/test/resources/config/application.yml.ejs +20 -10
- package/dist/generators/spring-boot/cleanup.js +3 -0
- package/dist/generators/spring-boot/command.js +127 -7
- package/dist/generators/spring-boot/files.js +0 -10
- package/dist/generators/spring-boot/generator.js +54 -4
- package/dist/generators/{server → spring-boot}/prompts.js +8 -72
- package/dist/generators/spring-boot/resources/spring-boot-dependencies.pom +380 -588
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/service/UserServiceIT.java.ejs +47 -11
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs +60 -24
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/UserResourceIT.java.ejs +195 -318
- package/dist/generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/_entityClass_ResourceIT.java.ejs +58 -51
- package/dist/generators/spring-cache/internal/dependencies.js +2 -2
- package/dist/generators/spring-cache/resources/gradle/libs.versions.toml +2 -2
- package/dist/generators/spring-cache/templates/src/main/java/_package_/config/CacheConfiguration.java.ejs +4 -0
- package/dist/generators/spring-cloud/generators/gateway/command.js +5 -1
- package/dist/generators/spring-cloud/generators/gateway/generator.js +13 -0
- package/dist/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.js +6 -0
- package/dist/generators/spring-data-cassandra/generator.js +2 -2
- package/dist/generators/spring-data-relational/support/h2-reserved-keywords.js +22 -0
- package/dist/generators/spring-data-relational/templates/src/test/java/_package_/config/SqlTestContainersSpringContextCustomizerFactory.java.ejs +3 -1
- package/dist/generators/upgrade/generator.js +0 -4
- package/dist/generators/vue/resources/package.json +22 -22
- package/dist/generators/vue/templates/src/main/webapp/app/account/change-password/change-password.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/login-form/login-form.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/register/register.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/finish/reset-password-finish.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/reset-password/init/reset-password-init.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/account/settings/settings.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/tracker/tracker.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/admin/user-management/user-management-edit.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/core/home/home.vue.ejs +7 -7
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-details.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_-update.vue.ejs +2 -2
- package/dist/generators/vue/templates/src/main/webapp/app/entities/_entityFolder_/_entityFile_.vue.ejs +1 -1
- package/dist/generators/vue/templates/src/main/webapp/app/shared/alert/alert.service.spec.ts.ejs +8 -8
- package/dist/generators/vue/templates/src/main/webapp/app/shared/data/data-utils.service.spec.ts.ejs +1 -1
- package/dist/generators/vue/templates/tsconfig.app.json.ejs +1 -1
- package/dist/generators/vue/templates/vite.config.mts.ejs +5 -4
- package/dist/generators/vue/templates/vitest.config.mts.ejs +1 -1
- package/dist/generators/vue/templates/webpack/webpack.microfrontend.js.jhi.vue.ejs +0 -9
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-basic-entity-converter.js +1 -1
- package/dist/jdl/converters/jdl-to-json/jdl-to-json-field-converter.js +4 -4
- package/dist/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.js +9 -9
- package/dist/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.js +2 -2
- package/dist/jdl/converters/json-to-jdl-application-converter.js +1 -1
- package/dist/jdl/converters/json-to-jdl-converter.js +6 -5
- package/dist/jdl/converters/json-to-jdl-entity-converter.js +14 -14
- package/dist/jdl/converters/json-to-jdl-option-converter.js +1 -2
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/application-converter.js +1 -1
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/option-converter.js +2 -2
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.js +7 -6
- package/dist/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.js +1 -1
- package/dist/jdl/exporters/applications/jhipster-application-formatter.js +16 -23
- package/dist/jdl/exporters/config.js +1 -0
- package/dist/jdl/exporters/jhipster-deployment-exporter.js +5 -5
- package/dist/jdl/exporters/jhipster-entity-exporter.js +1 -1
- package/dist/jdl/jdl-importer.js +22 -20
- package/dist/jdl/jhipster/binary-options.js +12 -8
- package/dist/jdl/jhipster/json-entity.js +1 -1
- package/dist/jdl/models/abstract-jdl-option.js +2 -2
- package/dist/jdl/models/jdl-application-configuration-factory.js +2 -0
- package/dist/jdl/models/jdl-binary-option.js +2 -2
- package/dist/jdl/models/jdl-deployment.js +11 -0
- package/dist/jdl/models/jdl-entity.js +1 -1
- package/dist/jdl/models/jdl-enum.js +1 -1
- package/dist/jdl/models/jdl-enums.js +0 -18
- package/dist/jdl/models/jdl-field.js +2 -2
- package/dist/jdl/models/jdl-object-wrapper.js +1 -0
- package/dist/jdl/models/jdl-object.js +23 -45
- package/dist/jdl/models/jdl-options.js +0 -18
- package/dist/jdl/models/jdl-relationships.js +8 -16
- package/dist/jdl/models/jdl-unary-option.js +1 -1
- package/dist/jdl/models/list-jdl-application-configuration-option.js +5 -2
- package/dist/jdl/parsing/jdl-ast-builder-visitor.js +12 -0
- package/dist/jdl/parsing/jdl-parser.js +14 -0
- package/dist/jdl/parsing/lexer/lexer.js +17 -11
- package/dist/jdl/parsing/validator.js +16 -2
- package/dist/jdl/readers/json-reader.js +1 -1
- package/dist/jdl/utils/array-utils.js +6 -0
- package/dist/jdl/utils/set-utils.js +3 -2
- package/dist/jdl/validators/jdl-without-application-validator.js +2 -2
- package/dist/testing/helpers.js +4 -0
- package/dist/types/generators/base/api.d.ts +6 -2
- package/dist/types/generators/base/generator.d.ts +10 -4
- package/dist/types/generators/base/priorities.d.ts +4 -0
- package/dist/types/generators/base/shared-data.d.ts +1 -1
- package/dist/types/generators/base-application/priorities.d.ts +2 -0
- package/dist/types/generators/base-application/support/entity.d.ts +2 -2
- package/dist/types/generators/base-application/support/prepare-entity.d.ts +3 -3
- package/dist/types/generators/base-application/support/relationship.d.ts +5 -5
- package/dist/types/generators/base-application/types.d.ts +15 -0
- package/dist/types/generators/base-core/generator.d.ts +16 -1
- package/dist/types/generators/base-entity-changes/types.d.ts +2 -0
- package/dist/types/generators/generator-constants.d.ts +1 -1
- package/dist/types/generators/java/support/add-java-annotation.d.ts +10 -20
- package/dist/types/generators/java/support/doc.d.ts +1 -1
- package/dist/types/generators/java/support/index.d.ts +1 -1
- package/dist/types/generators/server/support/relationship.d.ts +2 -2
- package/dist/types/generators/server/types.d.ts +5 -0
- package/dist/types/generators/spring-cloud/generators/gateway/jdl/jdl-routes-option.d.ts +2 -0
- package/dist/types/generators/spring-cloud/generators/gateway/types.d.ts +4 -0
- package/dist/types/generators/spring-data-relational/support/h2-reserved-keywords.d.ts +20 -0
- package/dist/types/jdl/converters/jdl-to-json/jdl-to-json-field-converter.d.ts +2 -2
- package/dist/types/jdl/converters/jdl-to-json/jdl-with-applications-to-json-converter.d.ts +2 -1
- package/dist/types/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.d.ts +3 -1
- package/dist/types/jdl/converters/json-to-jdl-application-converter.d.ts +9 -2
- package/dist/types/jdl/converters/json-to-jdl-converter.d.ts +3 -3
- package/dist/types/jdl/converters/json-to-jdl-entity-converter.d.ts +2 -4
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/application-converter.d.ts +3 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/deployment-converter.d.ts +2 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/entity-converter.d.ts +3 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/enum-converter.d.ts +2 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/field-converter.d.ts +2 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/option-converter.d.ts +3 -3
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/parsed-jdl-to-jdl-object-converter.d.ts +2 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/relationship-converter.d.ts +2 -1
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/types.d.ts +110 -0
- package/dist/types/jdl/converters/parsed-jdl-to-jdl-object/validation-converter.d.ts +2 -1
- package/dist/types/jdl/converters/types.d.ts +102 -14
- package/dist/types/jdl/exporters/applications/jhipster-application-formatter.d.ts +4 -4
- package/dist/types/jdl/exporters/config.d.ts +2 -1
- package/dist/types/jdl/exporters/export-utils.d.ts +2 -1
- package/dist/types/jdl/exporters/jdl-exporter.d.ts +2 -1
- package/dist/types/jdl/exporters/jhipster-deployment-exporter.d.ts +3 -1
- package/dist/types/jdl/exporters/jhipster-entity-exporter.d.ts +3 -1
- package/dist/types/jdl/exporters/types.d.ts +61 -0
- package/dist/types/jdl/jhipster/binary-options.d.ts +8 -26
- package/dist/types/jdl/jhipster/field-types.d.ts +2 -2
- package/dist/types/jdl/jhipster/json-entity.d.ts +2 -2
- package/dist/types/jdl/models/abstract-jdl-option.d.ts +14 -9
- package/dist/types/jdl/models/boolean-jdl-application-configuration-option.d.ts +1 -1
- package/dist/types/jdl/models/integer-jdl-application-configuration-option.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application-configuration-factory.d.ts +1 -1
- package/dist/types/jdl/models/jdl-application-configuration-option.d.ts +4 -4
- package/dist/types/jdl/models/jdl-application-configuration.d.ts +4 -4
- package/dist/types/jdl/models/jdl-application-definition.d.ts +4 -4
- package/dist/types/jdl/models/jdl-application-entities.d.ts +4 -4
- package/dist/types/jdl/models/jdl-application.d.ts +16 -13
- package/dist/types/jdl/models/jdl-binary-option.d.ts +5 -3
- package/dist/types/jdl/models/jdl-deployment.d.ts +13 -1
- package/dist/types/jdl/models/jdl-entity.d.ts +5 -5
- package/dist/types/jdl/models/jdl-enum-value.d.ts +4 -4
- package/dist/types/jdl/models/jdl-enum.d.ts +9 -5
- package/dist/types/jdl/models/jdl-enums.d.ts +6 -5
- package/dist/types/jdl/models/jdl-field.d.ts +10 -8
- package/dist/types/jdl/models/jdl-object-wrapper.d.ts +25 -0
- package/dist/types/jdl/models/jdl-object.d.ts +23 -19
- package/dist/types/jdl/models/jdl-options.d.ts +7 -24
- package/dist/types/jdl/models/jdl-relationship.d.ts +16 -10
- package/dist/types/jdl/models/jdl-relationships.d.ts +5 -5
- package/dist/types/jdl/models/jdl-validation.d.ts +3 -3
- package/dist/types/jdl/models/list-jdl-application-configuration-option.d.ts +4 -3
- package/dist/types/jdl/models/string-jdl-application-configuration-option.d.ts +2 -2
- package/dist/types/jdl/parsing/jdl-ast-builder-visitor.d.ts +1 -0
- package/dist/types/jdl/parsing/jdl-parser.d.ts +1 -0
- package/dist/types/jdl/parsing/jdl-parsing-types.d.ts +23 -0
- package/dist/types/jdl/parsing/lexer/lexer.d.ts +6 -2
- package/dist/types/jdl/parsing/validator.d.ts +1 -1
- package/dist/types/jdl/utils/array-utils.d.ts +1 -0
- package/dist/types/jdl/utils/set-utils.d.ts +1 -19
- package/dist/types/jdl/validators/deployment-validator.d.ts +2 -1
- package/dist/types/testing/helpers.d.ts +13 -3
- package/package.json +30 -30
- package/dist/generators/languages/templates/src/main/webapp/i18n/al/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ar-ly/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/az-Latn-az/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/bg/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/bn/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/by/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ca/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/cs/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/da/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/de/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/el/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/en/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/es/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/et/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fa/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/fr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/gl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hu/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/hy/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/id/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/it/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ja/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ko/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/kr-Latn-kr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/mr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/my/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/nl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pl/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-br/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/pt-pt/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ro/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ru/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sk/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/sv/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ta/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/th/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/tr/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/ua/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/global.json +0 -148
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Cyrl-uz/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/uz-Latn-uz/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/vi/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-cn/home.json +0 -19
- package/dist/generators/languages/templates/src/main/webapp/i18n/zh-tw/home.json +0 -19
- package/dist/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_imperative.java.ejs +0 -43
- package/dist/generators/server/templates/src/main/java/_package_/config/LocaleConfiguration_reactive.java.ejs +0 -184
- package/dist/generators/statistics.js +0 -223
- /package/dist/jdl/converters/{types.js → parsed-jdl-to-jdl-object/types.js} +0 -0
|
@@ -72,6 +72,7 @@ export default class JDLParser extends CstParser {
|
|
|
72
72
|
this.applicationNamespaceConfigDeclaration();
|
|
73
73
|
this.namespaceConfigValue();
|
|
74
74
|
this.qualifiedName();
|
|
75
|
+
this.quotedList();
|
|
75
76
|
this.list();
|
|
76
77
|
// very important to call this after all the rules have been defined.
|
|
77
78
|
// otherwise the parsers may not work correctly as it will lack information
|
|
@@ -534,6 +535,7 @@ export default class JDLParser extends CstParser {
|
|
|
534
535
|
this.OR([
|
|
535
536
|
{ ALT: () => this.CONSUME(LexerTokens.BOOLEAN) },
|
|
536
537
|
{ ALT: () => this.SUBRULE(this.qualifiedName) },
|
|
538
|
+
{ ALT: () => this.SUBRULE(this.quotedList) },
|
|
537
539
|
{ ALT: () => this.SUBRULE(this.list) },
|
|
538
540
|
{ ALT: () => this.CONSUME(LexerTokens.INTEGER) },
|
|
539
541
|
{ ALT: () => this.CONSUME(LexerTokens.STRING) },
|
|
@@ -562,6 +564,18 @@ export default class JDLParser extends CstParser {
|
|
|
562
564
|
this.CONSUME(LexerTokens.RSQUARE);
|
|
563
565
|
});
|
|
564
566
|
}
|
|
567
|
+
quotedList() {
|
|
568
|
+
this.RULE('quotedList', () => {
|
|
569
|
+
this.CONSUME(LexerTokens.LSQUARE);
|
|
570
|
+
this.AT_LEAST_ONE_SEP({
|
|
571
|
+
SEP: LexerTokens.COMMA,
|
|
572
|
+
DEF: () => {
|
|
573
|
+
this.CONSUME(LexerTokens.STRING);
|
|
574
|
+
},
|
|
575
|
+
});
|
|
576
|
+
this.CONSUME(LexerTokens.RSQUARE);
|
|
577
|
+
});
|
|
578
|
+
}
|
|
565
579
|
applicationSubEntities() {
|
|
566
580
|
this.RULE('applicationSubEntities', () => {
|
|
567
581
|
this.CONSUME(LexerTokens.ENTITIES);
|
|
@@ -25,11 +25,11 @@ import DeploymentTokens from './deployment-tokens.js';
|
|
|
25
25
|
import RelationshipTypeTokens from './relationship-type-tokens.js';
|
|
26
26
|
import OptionTokens from './option-tokens.js';
|
|
27
27
|
import createTokenFromConfigCreator from './token-creator.js';
|
|
28
|
-
|
|
28
|
+
const _tokens = {};
|
|
29
29
|
const { BUILT_IN_ENTITY } = relationshipOptions;
|
|
30
30
|
function createTokenFromConfig(config) {
|
|
31
31
|
const newToken = createTokenFromConfigCreator(config);
|
|
32
|
-
|
|
32
|
+
_tokens[config.name] = newToken;
|
|
33
33
|
return newToken;
|
|
34
34
|
}
|
|
35
35
|
// Some categories to make the grammar easier to read
|
|
@@ -63,7 +63,7 @@ createTokenFromConfig({
|
|
|
63
63
|
createTokenFromConfig({ name: 'CONFIG', pattern: 'config' });
|
|
64
64
|
createTokenFromConfig({ name: 'ENTITIES', pattern: 'entities' });
|
|
65
65
|
ApplicationTokens.tokens.forEach(token => {
|
|
66
|
-
|
|
66
|
+
_tokens[token.name] = token;
|
|
67
67
|
});
|
|
68
68
|
// application must appear AFTER "applicationType" due to shorter common prefix.
|
|
69
69
|
createTokenFromConfig({ name: 'APPLICATION', pattern: 'application' });
|
|
@@ -74,7 +74,7 @@ createTokenFromConfig({
|
|
|
74
74
|
categories: [CONFIG_KEY, DEPLOYMENT_KEY],
|
|
75
75
|
});
|
|
76
76
|
DeploymentTokens.tokens.forEach(token => {
|
|
77
|
-
|
|
77
|
+
_tokens[token.name] = token;
|
|
78
78
|
});
|
|
79
79
|
createTokenFromConfig({ name: 'DEPLOYMENT', pattern: 'deployment' });
|
|
80
80
|
// boolean value constants
|
|
@@ -88,16 +88,16 @@ createTokenFromConfig({ name: 'RELATIONSHIP', pattern: 'relationship' });
|
|
|
88
88
|
createTokenFromConfig({ name: 'BUILT_IN_ENTITY', pattern: BUILT_IN_ENTITY });
|
|
89
89
|
// Category For the relationship type key names
|
|
90
90
|
RelationshipTypeTokens.tokens.forEach(token => {
|
|
91
|
-
|
|
91
|
+
_tokens[token.name] = token;
|
|
92
92
|
});
|
|
93
93
|
createTokenFromConfig({ name: 'STAR', pattern: '*' });
|
|
94
94
|
// Options
|
|
95
95
|
OptionTokens.tokens.forEach(token => {
|
|
96
|
-
|
|
96
|
+
_tokens[token.name] = token;
|
|
97
97
|
});
|
|
98
98
|
// validations
|
|
99
99
|
ValidationTokens.tokens.forEach(token => {
|
|
100
|
-
|
|
100
|
+
_tokens[token.name] = token;
|
|
101
101
|
});
|
|
102
102
|
createTokenFromConfig({ name: 'REGEX', pattern: /\/[^\n\r]*\// });
|
|
103
103
|
createTokenFromConfig({ name: 'DECIMAL', pattern: /-?\d+\.\d+/ });
|
|
@@ -118,10 +118,16 @@ createTokenFromConfig({ name: 'DOT', pattern: '.' });
|
|
|
118
118
|
createTokenFromConfig({ name: 'TO', pattern: 'to' });
|
|
119
119
|
// annotations
|
|
120
120
|
createTokenFromConfig({ name: 'AT', pattern: '@' });
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
121
|
+
const typedTokens = {
|
|
122
|
+
UNARY_OPTION,
|
|
123
|
+
BINARY_OPTION,
|
|
124
|
+
// Imperative the "NAME" token will be added after all the keywords to resolve keywords vs identifier conflict.
|
|
125
|
+
NAME,
|
|
126
|
+
};
|
|
127
|
+
export const tokens = {
|
|
128
|
+
..._tokens,
|
|
129
|
+
...typedTokens,
|
|
130
|
+
};
|
|
125
131
|
// with 'ensureOptimizations' the lexer initialization will throw a descriptive error
|
|
126
132
|
// instead of silently reverting to an unoptimized algorithm.
|
|
127
133
|
// This will avoid performance regressions.
|
|
@@ -377,6 +377,15 @@ class JDLSyntaxValidatorVisitor extends BaseJDLCSTVisitorWithDefaults {
|
|
|
377
377
|
return false;
|
|
378
378
|
}
|
|
379
379
|
return true;
|
|
380
|
+
case 'quotedList':
|
|
381
|
+
if (actual.name !== 'quotedList') {
|
|
382
|
+
this.errors.push({
|
|
383
|
+
message: `An array of names is expected, but found: "${getFirstToken(actual).image}"`,
|
|
384
|
+
token: getFirstToken(actual),
|
|
385
|
+
});
|
|
386
|
+
return false;
|
|
387
|
+
}
|
|
388
|
+
return true;
|
|
380
389
|
case 'INTEGER':
|
|
381
390
|
if (actual.tokenType !== LexerTokens.INTEGER) {
|
|
382
391
|
this.errors.push({
|
|
@@ -414,8 +423,13 @@ class JDLSyntaxValidatorVisitor extends BaseJDLCSTVisitorWithDefaults {
|
|
|
414
423
|
if (!validation) {
|
|
415
424
|
throw Error(`Got an invalid application config property: '${propertyName}'.`);
|
|
416
425
|
}
|
|
417
|
-
if (this.checkExpectedValueType(validation.type, value) && validation.pattern && value.children
|
|
418
|
-
value.children.NAME
|
|
426
|
+
if (this.checkExpectedValueType(validation.type, value) && validation.pattern && value.children) {
|
|
427
|
+
if (value.children.NAME) {
|
|
428
|
+
value.children.NAME.forEach(nameTok => this.checkNameSyntax(nameTok, validation.pattern, validation.msg));
|
|
429
|
+
}
|
|
430
|
+
if (value.children.STRING) {
|
|
431
|
+
value.children.STRING.forEach(nameTok => this.checkNameSyntax(nameTok, validation.pattern, validation.msg));
|
|
432
|
+
}
|
|
419
433
|
}
|
|
420
434
|
}
|
|
421
435
|
checkDeploymentConfigPropSyntax(key, value) {
|
|
@@ -51,6 +51,6 @@ export default function parseFromDir(dir) {
|
|
|
51
51
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
52
52
|
// @ts-expect-error
|
|
53
53
|
const jdlObject = convertServerOptionsToJDL(applicationOptions);
|
|
54
|
-
const convertedJDLObject = convertEntitiesToJDL(
|
|
54
|
+
const convertedJDLObject = convertEntitiesToJDL(entities);
|
|
55
55
|
return mergeJDLObjects(jdlObject, convertedJDLObject);
|
|
56
56
|
}
|
|
@@ -19,3 +19,9 @@
|
|
|
19
19
|
export default function deduplicate(array) {
|
|
20
20
|
return Array.from(new Set(array));
|
|
21
21
|
}
|
|
22
|
+
export function join(set, separator = ',', quoted = false) {
|
|
23
|
+
if (!set) {
|
|
24
|
+
throw new Error('An Array must be passed so as to join elements.');
|
|
25
|
+
}
|
|
26
|
+
return set.map(val => (quoted ? `"${val}"` : val)).join(separator);
|
|
27
|
+
}
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
+
import { join as arrayJoin } from './array-utils.js';
|
|
19
20
|
export function addAll(set, elements) {
|
|
20
21
|
if (!set) {
|
|
21
22
|
throw new Error('A Set must be passed so as to insert elements.');
|
|
@@ -26,9 +27,9 @@ export function addAll(set, elements) {
|
|
|
26
27
|
elements.forEach(element => set.add(element));
|
|
27
28
|
return set;
|
|
28
29
|
}
|
|
29
|
-
export function join(set, separator = ',') {
|
|
30
|
+
export function join(set, separator = ',', quoted = false) {
|
|
30
31
|
if (!set) {
|
|
31
32
|
throw new Error('A Set must be passed so as to join elements.');
|
|
32
33
|
}
|
|
33
|
-
return Array.from(set)
|
|
34
|
+
return arrayJoin(Array.from(set), separator, quoted);
|
|
34
35
|
}
|
|
@@ -89,10 +89,10 @@ export default function createValidator(jdlObject, applicationSettings = {}, log
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
const typeCheckingFunction = getTypeCheckingFunction(entityName, applicationSettings);
|
|
92
|
-
|
|
92
|
+
const isAnEnum = jdlObject.hasEnum(jdlField.type);
|
|
93
|
+
if (!isAnEnum && !typeCheckingFunction(jdlField.type)) {
|
|
93
94
|
throw new Error(`The type '${jdlField.type}' is an unknown field type for field '${fieldName}' of entity '${entityName}'.`);
|
|
94
95
|
}
|
|
95
|
-
const isAnEnum = jdlObject.hasEnum(jdlField.type);
|
|
96
96
|
checkForValidationErrors(jdlField, isAnEnum);
|
|
97
97
|
});
|
|
98
98
|
}
|
package/dist/testing/helpers.js
CHANGED
|
@@ -53,6 +53,7 @@ const createFiles = (workspaceFolder, configuration, entities) => {
|
|
|
53
53
|
...entityFiles,
|
|
54
54
|
};
|
|
55
55
|
};
|
|
56
|
+
export const createJHipsterConfigFiles = (configuration, entities) => createFiles('', configuration, entities);
|
|
56
57
|
export const createBlueprintFiles = (blueprintPackage, { packageJson, generator = 'test-blueprint', generatorContent, files = {} } = {}) => {
|
|
57
58
|
generatorContent =
|
|
58
59
|
generatorContent ??
|
|
@@ -85,6 +86,9 @@ class JHipsterRunContext extends RunContext {
|
|
|
85
86
|
workspaceApplications = [];
|
|
86
87
|
commonWorkspacesConfig;
|
|
87
88
|
generateApplicationsSet = false;
|
|
89
|
+
withOptions(options) {
|
|
90
|
+
return super.withOptions(options);
|
|
91
|
+
}
|
|
88
92
|
withJHipsterConfig(configuration, entities) {
|
|
89
93
|
return this.withFiles(createFiles('', { baseName: 'jhipster', creationTimestamp: parseCreationTimestamp('2020-01-01'), ...configuration }, entities));
|
|
90
94
|
}
|
|
@@ -205,9 +205,9 @@ export type ConfigSpec = {
|
|
|
205
205
|
description?: string;
|
|
206
206
|
choices?: JHispterChoices;
|
|
207
207
|
|
|
208
|
-
cli?: SetOptional<CliOptionSpec, 'name'
|
|
208
|
+
cli?: SetOptional<CliOptionSpec, 'name'> & { env?: string };
|
|
209
209
|
argument?: JHipsterArgumentConfig;
|
|
210
|
-
prompt?: PromptSpec | ((CoreGenerator) => PromptSpec);
|
|
210
|
+
prompt?: PromptSpec | ((gen: CoreGenerator & { jhipsterConfigWithDefaults: Record<string, any> }, config: ConfigSpec) => PromptSpec);
|
|
211
211
|
scope?: 'storage' | 'blueprint' | 'generator';
|
|
212
212
|
/**
|
|
213
213
|
* The callback receives the generator as input for 'generator' scope.
|
|
@@ -215,6 +215,10 @@ export type ConfigSpec = {
|
|
|
215
215
|
* The callback receives blueprintStorage contents as input for 'blueprint' scope.
|
|
216
216
|
*/
|
|
217
217
|
default?: string | boolean | string[] | ((any) => string | boolean | string[]);
|
|
218
|
+
/**
|
|
219
|
+
* Configure the generator according to the selected configuration.
|
|
220
|
+
*/
|
|
221
|
+
configure?: (gen: CoreGenerator) => void;
|
|
218
222
|
};
|
|
219
223
|
|
|
220
224
|
export type JHipsterArguments = Record<string, JHipsterArgumentConfig>;
|
|
@@ -76,6 +76,16 @@ export default class JHipsterBaseBlueprintGenerator<Definition extends BaseGener
|
|
|
76
76
|
* Utility method to get typed objects for autocomplete.
|
|
77
77
|
*/
|
|
78
78
|
asComposingTaskGroup(taskGroup: GenericTaskGroup<this, Definition['composingTaskParam']>): GenericTaskGroup<this, Definition['composingTaskParam']>;
|
|
79
|
+
/**
|
|
80
|
+
* Priority API stub for blueprints.
|
|
81
|
+
*
|
|
82
|
+
* ComposingComponent priority should be used to handle component configuration order.
|
|
83
|
+
*/
|
|
84
|
+
get composingComponent(): GenericTaskGroup<this, Definition['composingTaskParam']>;
|
|
85
|
+
/**
|
|
86
|
+
* Utility method to get typed objects for autocomplete.
|
|
87
|
+
*/
|
|
88
|
+
asComposingComponentTaskGroup(taskGroup: GenericTaskGroup<this, Definition['composingTaskParam']>): GenericTaskGroup<this, Definition['composingTaskParam']>;
|
|
79
89
|
/**
|
|
80
90
|
* Priority API stub for blueprints.
|
|
81
91
|
*
|
|
@@ -207,10 +217,6 @@ export default class JHipsterBaseBlueprintGenerator<Definition extends BaseGener
|
|
|
207
217
|
* Utility method to get typed objects for autocomplete.
|
|
208
218
|
*/
|
|
209
219
|
asEndTaskGroup(taskGroup: GenericTaskGroup<this, Definition['endTaskParam']>): GenericTaskGroup<this, Definition['endTaskParam']>;
|
|
210
|
-
/**
|
|
211
|
-
* JHipster config with default values fallback
|
|
212
|
-
*/
|
|
213
|
-
get jhipsterConfigWithDefaults(): any;
|
|
214
220
|
/**
|
|
215
221
|
* @protected
|
|
216
222
|
* Composes with blueprint generators, if any.
|
|
@@ -45,6 +45,7 @@ export namespace PRIORITY_NAMES {
|
|
|
45
45
|
export { PROMPTING };
|
|
46
46
|
export { CONFIGURING };
|
|
47
47
|
export { COMPOSING };
|
|
48
|
+
export { COMPOSING_COMPONENT };
|
|
48
49
|
export { LOADING };
|
|
49
50
|
export { PREPARING };
|
|
50
51
|
export { POST_PREPARING };
|
|
@@ -64,6 +65,7 @@ export namespace QUEUES {
|
|
|
64
65
|
export { PROMPTING as PROMPTING_QUEUE };
|
|
65
66
|
export { CONFIGURING as CONFIGURING_QUEUE };
|
|
66
67
|
export { COMPOSING_QUEUE };
|
|
68
|
+
export { COMPOSING_COMPONENT_QUEUE };
|
|
67
69
|
export { LOADING_QUEUE };
|
|
68
70
|
export { PREPARING_QUEUE };
|
|
69
71
|
export { POST_PREPARING_QUEUE };
|
|
@@ -83,6 +85,7 @@ declare const PROMPTING: "prompting";
|
|
|
83
85
|
declare const CONFIGURING: "configuring";
|
|
84
86
|
/** Custom priorities */
|
|
85
87
|
declare const COMPOSING: "composing";
|
|
88
|
+
declare const COMPOSING_COMPONENT: "composingComponent";
|
|
86
89
|
declare const LOADING: "loading";
|
|
87
90
|
declare const PREPARING: "preparing";
|
|
88
91
|
declare const POST_PREPARING: "postPreparing";
|
|
@@ -97,6 +100,7 @@ declare const INSTALL: "install";
|
|
|
97
100
|
declare const POST_INSTALL: "postInstall";
|
|
98
101
|
declare const END: "end";
|
|
99
102
|
declare const COMPOSING_QUEUE: "jhipster:composing";
|
|
103
|
+
declare const COMPOSING_COMPONENT_QUEUE: "jhipster:composingComponent";
|
|
100
104
|
declare const LOADING_QUEUE: "jhipster:loading";
|
|
101
105
|
declare const PREPARING_QUEUE: "jhipster:preparing";
|
|
102
106
|
declare const POST_PREPARING_QUEUE: "jhipster:postPreparing";
|
|
@@ -6,7 +6,7 @@ export default class SharedData<ApplicationType extends BaseApplication = BaseAp
|
|
|
6
6
|
getSource(): any;
|
|
7
7
|
getControl(): Control;
|
|
8
8
|
getApplication(): ApplicationType;
|
|
9
|
-
setEntity(entityName:
|
|
9
|
+
setEntity(entityName: string, entity: any): void;
|
|
10
10
|
hasEntity(entityName: any): boolean;
|
|
11
11
|
getEntity(entityName: any): any;
|
|
12
12
|
getEntities(entityNames?: string[]): {
|
|
@@ -27,6 +27,7 @@ export const PRIORITY_NAMES: {
|
|
|
27
27
|
PROMPTING: string;
|
|
28
28
|
CONFIGURING: string;
|
|
29
29
|
COMPOSING: string;
|
|
30
|
+
COMPOSING_COMPONENT: string;
|
|
30
31
|
LOADING: string;
|
|
31
32
|
PREPARING: string;
|
|
32
33
|
POST_PREPARING: string;
|
|
@@ -54,6 +55,7 @@ export const QUEUES: {
|
|
|
54
55
|
PROMPTING_QUEUE: string;
|
|
55
56
|
CONFIGURING_QUEUE: string;
|
|
56
57
|
COMPOSING_QUEUE: string;
|
|
58
|
+
COMPOSING_COMPONENT_QUEUE: string;
|
|
57
59
|
LOADING_QUEUE: string;
|
|
58
60
|
PREPARING_QUEUE: string;
|
|
59
61
|
POST_PREPARING_QUEUE: string;
|
|
@@ -16,5 +16,5 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
20
|
-
export declare const findEntityInEntities: (entityName: string, entities:
|
|
19
|
+
import { JSONEntity } from '../../../jdl/converters/types.js';
|
|
20
|
+
export declare const findEntityInEntities: (entityName: string, entities: JSONEntity[]) => JSONEntity | undefined;
|
|
@@ -2,10 +2,10 @@ import type BaseGenerator from '../../base-core/index.js';
|
|
|
2
2
|
import { Entity } from '../types/index.js';
|
|
3
3
|
import type CoreGenerator from '../../base-core/generator.js';
|
|
4
4
|
export declare const entityDefaultConfig: {
|
|
5
|
-
pagination:
|
|
5
|
+
pagination: any;
|
|
6
6
|
anyPropertyHasValidation: boolean;
|
|
7
|
-
dto:
|
|
8
|
-
service:
|
|
7
|
+
dto: any;
|
|
8
|
+
service: any;
|
|
9
9
|
jpaMetamodelFiltering: boolean;
|
|
10
10
|
readOnly: boolean;
|
|
11
11
|
embedded: boolean;
|
|
@@ -16,12 +16,12 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
19
|
+
import { JSONRelationship, JSONEntity } from '../../../jdl/converters/types.js';
|
|
20
20
|
import { ValidationResult } from '../../base/api.js';
|
|
21
21
|
export declare const otherRelationshipType: (relationshipType: any) => any;
|
|
22
|
-
export declare const findOtherRelationshipInRelationships: (entityName: string, relationship:
|
|
23
|
-
export declare const loadEntitiesAnnotations: (entities:
|
|
24
|
-
export declare const loadEntitiesOtherSide: (entities:
|
|
22
|
+
export declare const findOtherRelationshipInRelationships: (entityName: string, relationship: JSONRelationship, inRelationships: JSONRelationship[]) => JSONRelationship | undefined;
|
|
23
|
+
export declare const loadEntitiesAnnotations: (entities: JSONEntity[]) => void;
|
|
24
|
+
export declare const loadEntitiesOtherSide: (entities: JSONEntity[], { application }?: {
|
|
25
25
|
application?: any;
|
|
26
26
|
}) => ValidationResult;
|
|
27
|
-
export declare const addOtherRelationship: (entity:
|
|
27
|
+
export declare const addOtherRelationship: (entity: JSONEntity, otherEntity: JSONEntity, relationship: JSONRelationship) => JSONRelationship;
|
|
@@ -117,11 +117,26 @@ export type CommonClientServerApplication = BaseApplication &
|
|
|
117
117
|
backendTypeSpringBoot?: boolean;
|
|
118
118
|
temporaryDir?: string;
|
|
119
119
|
|
|
120
|
+
hipsterName?: string;
|
|
121
|
+
hipsterProductName?: string;
|
|
122
|
+
hipsterHomePageProductName?: string;
|
|
123
|
+
hipsterStackOverflowProductName?: string;
|
|
124
|
+
hipsterBugTrackerProductName?: string;
|
|
125
|
+
hipsterChatProductName?: string;
|
|
126
|
+
hipsterTwitterUsername?: string;
|
|
127
|
+
hipsterDocumentationLink?: string;
|
|
128
|
+
hipsterTwitterLink?: string;
|
|
129
|
+
hipsterProjectLink?: string;
|
|
130
|
+
hipsterStackoverflowLink?: string;
|
|
131
|
+
hipsterBugTrackerLink?: string;
|
|
132
|
+
hipsterChatLink?: string;
|
|
133
|
+
|
|
120
134
|
dockerServicesDir?: string;
|
|
121
135
|
dockerServices?: string[];
|
|
122
136
|
prettierExtensions?: string;
|
|
123
137
|
|
|
124
138
|
skipUserManagement?: boolean;
|
|
139
|
+
syncUserWithIdp?: boolean;
|
|
125
140
|
generateUserManagement?: boolean;
|
|
126
141
|
};
|
|
127
142
|
|
|
@@ -17,6 +17,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
|
|
|
17
17
|
static PROMPTING: string;
|
|
18
18
|
static CONFIGURING: string;
|
|
19
19
|
static COMPOSING: string;
|
|
20
|
+
static COMPOSING_COMPONENT: string;
|
|
20
21
|
static LOADING: string;
|
|
21
22
|
static PREPARING: string;
|
|
22
23
|
static POST_PREPARING: string;
|
|
@@ -62,6 +63,10 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
|
|
|
62
63
|
* @deprecated
|
|
63
64
|
*/
|
|
64
65
|
get needleApi(): NeedleApi;
|
|
66
|
+
/**
|
|
67
|
+
* JHipster config with default values fallback
|
|
68
|
+
*/
|
|
69
|
+
get jhipsterConfigWithDefaults(): any;
|
|
65
70
|
/**
|
|
66
71
|
* Warn or throws check failure based on current skipChecks option.
|
|
67
72
|
* @param message
|
|
@@ -72,7 +77,12 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
|
|
|
72
77
|
*
|
|
73
78
|
* @param {string} version - A valid semver version string
|
|
74
79
|
*/
|
|
75
|
-
isJhipsterVersionLessThan(version: any):
|
|
80
|
+
isJhipsterVersionLessThan(version: any): any;
|
|
81
|
+
/**
|
|
82
|
+
* Wrapper for `semver.lt` to check if the oldVersion exists and is less than the newVersion.
|
|
83
|
+
* Can be used by blueprints.
|
|
84
|
+
*/
|
|
85
|
+
isVersionLessThan(oldVersion: string | null, newVersion: string): any;
|
|
76
86
|
/**
|
|
77
87
|
* Get arguments for the priority
|
|
78
88
|
*/
|
|
@@ -109,6 +119,11 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
|
|
|
109
119
|
* Blueprints with command override takes precedence.
|
|
110
120
|
*/
|
|
111
121
|
promptCurrentJHipsterCommand(): Promise<any>;
|
|
122
|
+
/**
|
|
123
|
+
* Configure the current JHipster command.
|
|
124
|
+
* Blueprints with command override takes precedence.
|
|
125
|
+
*/
|
|
126
|
+
configureCurrentJHipsterCommandConfig(): Promise<void>;
|
|
112
127
|
/**
|
|
113
128
|
* Load the current JHipster command storage configuration into the context.
|
|
114
129
|
* Blueprints with command override takes precedence.
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export const BLUEPRINT_API_VERSION: "jhipster-8";
|
|
2
|
-
export const JHIPSTER_DEPENDENCIES_VERSION: "8.
|
|
2
|
+
export const JHIPSTER_DEPENDENCIES_VERSION: "8.5.0";
|
|
3
3
|
export const JAVA_VERSION: "17";
|
|
4
4
|
export const JAVA_COMPATIBLE_VERSIONS: string[];
|
|
5
5
|
export const ADD_SPRING_MILESTONE_REPOSITORY: false;
|
|
@@ -1,22 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
-
* you may not use this file except in compliance with the License.
|
|
9
|
-
* You may obtain a copy of the License at
|
|
10
|
-
*
|
|
11
|
-
* https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
-
*
|
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
-
* See the License for the specific language governing permissions and
|
|
17
|
-
* limitations under the License.
|
|
18
|
-
*/
|
|
19
|
-
export default function addJavaAnnotation(content: string, { package: packageName, annotation }: {
|
|
1
|
+
export type JavaImportType = {
|
|
2
|
+
staticImport?: boolean;
|
|
3
|
+
};
|
|
4
|
+
export declare function addJavaImport(indentifier: string, type?: JavaImportType): (content: string) => string;
|
|
5
|
+
export declare function addJavaImport(content: string, identifierOrType: string, type?: JavaImportType): string;
|
|
6
|
+
export type JavaAnnotation = {
|
|
20
7
|
package?: string;
|
|
21
8
|
annotation: string;
|
|
22
|
-
|
|
9
|
+
parameters?: (oldParameters?: string) => string;
|
|
10
|
+
};
|
|
11
|
+
export declare function addJavaAnnotation(annotation: JavaAnnotation): (content: string) => string;
|
|
12
|
+
export declare function addJavaAnnotation(content: string, annotation: JavaAnnotation): string;
|
|
@@ -6,4 +6,4 @@
|
|
|
6
6
|
* @returns javadoc formatted string
|
|
7
7
|
*/
|
|
8
8
|
export declare const formatDocAsJavaDoc: (text: string, indentSize?: number) => string;
|
|
9
|
-
export declare const formatDocAsApiDescription: (text
|
|
9
|
+
export declare const formatDocAsApiDescription: (text?: string) => string | undefined;
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
export
|
|
19
|
+
export * from './add-java-annotation.js';
|
|
20
20
|
export * from './artifacts.js';
|
|
21
21
|
export * from './checks/index.js';
|
|
22
22
|
export * from './doc.js';
|
|
@@ -16,6 +16,6 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
import {
|
|
19
|
+
import { JSONEntity } from '../../../jdl/converters/types.js';
|
|
20
20
|
import { ValidationResult } from '../../base/api.js';
|
|
21
|
-
export declare const addEntitiesOtherRelationships: (entities:
|
|
21
|
+
export declare const addEntitiesOtherRelationships: (entities: JSONEntity[]) => ValidationResult;
|
|
@@ -6,6 +6,7 @@ import { SpringCacheSourceType } from '../spring-cache/types.js';
|
|
|
6
6
|
import { MessageBrokerApplicationType } from './options/message-broker.js';
|
|
7
7
|
import type { DeterministicOptionWithDerivedProperties, OptionWithDerivedProperties } from '../base-application/application-options.js';
|
|
8
8
|
import { ApplicationPropertiesNeedles } from './support/needles.ts';
|
|
9
|
+
import { GatewayApplication } from '../spring-cloud/generators/gateway/types.ts';
|
|
9
10
|
|
|
10
11
|
export type SpringEntity = {
|
|
11
12
|
/* Generate entity's Entity */
|
|
@@ -91,6 +92,7 @@ export type SpringBootApplication = JavaApplication &
|
|
|
91
92
|
BuildToolApplication &
|
|
92
93
|
SearchEngine &
|
|
93
94
|
DatabaseTypeApplication &
|
|
95
|
+
GatewayApplication &
|
|
94
96
|
MessageBrokerApplicationType & {
|
|
95
97
|
jhipsterDependenciesVersion: string;
|
|
96
98
|
springBootDependencies: Record<string, string>;
|
|
@@ -111,4 +113,7 @@ export type SpringBootApplication = JavaApplication &
|
|
|
111
113
|
databaseMigrationLiquibase: boolean;
|
|
112
114
|
|
|
113
115
|
communicationSpringWebsocket: boolean;
|
|
116
|
+
requiresDeleteAllUsers: boolean;
|
|
117
|
+
reactorBlock: string;
|
|
118
|
+
reactorBlockOptional: string;
|
|
114
119
|
};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Copyright 2013-2024 the original author or authors from the JHipster project.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of the JHipster project, see https://www.jhipster.tech/
|
|
5
|
+
* for more information.
|
|
6
|
+
*
|
|
7
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
+
* you may not use this file except in compliance with the License.
|
|
9
|
+
* You may obtain a copy of the License at
|
|
10
|
+
*
|
|
11
|
+
* https://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
*
|
|
13
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
+
* See the License for the specific language governing permissions and
|
|
17
|
+
* limitations under the License.
|
|
18
|
+
*/
|
|
19
|
+
export declare const h2ReservedKeywords: string[];
|
|
20
|
+
export declare const isReservedH2Keyword: (keyword: string) => boolean;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import JDLObject from '../../models/jdl-object.js';
|
|
2
|
-
import {
|
|
2
|
+
import { JSONField } from '../types.js';
|
|
3
3
|
declare const _default: {
|
|
4
4
|
convert: typeof convert;
|
|
5
5
|
};
|
|
@@ -9,4 +9,4 @@ export default _default;
|
|
|
9
9
|
* @param jdlObject - the JDL object containing entities, fields and enums.
|
|
10
10
|
* @return a map having for keys an entity's name and for values its JSON fields.
|
|
11
11
|
*/
|
|
12
|
-
export declare function convert(jdlObject: JDLObject): Map<string,
|
|
12
|
+
export declare function convert(jdlObject: JDLObject): Map<string, JSONField[]>;
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
+
import { JdlObjectWrapper } from '../../models/jdl-object-wrapper.js';
|
|
19
20
|
declare const _default: {
|
|
20
21
|
convert: typeof convert;
|
|
21
22
|
};
|
|
@@ -26,4 +27,4 @@ export default _default;
|
|
|
26
27
|
* @param {JDLObject} args.jdlObject - the JDLObject to convert to JSON
|
|
27
28
|
* @returns {Map} entities that can be exported to JSON
|
|
28
29
|
*/
|
|
29
|
-
export declare function convert(args
|
|
30
|
+
export declare function convert(args: JdlObjectWrapper): Map<string, any> | Map<any, never[]>;
|
package/dist/types/jdl/converters/jdl-to-json/jdl-without-application-to-json-converter.d.ts
CHANGED
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
+
import JSONEntity from '../../jhipster/json-entity.js';
|
|
20
|
+
import { JdlObjectWrapper } from '../../models/jdl-object-wrapper.js';
|
|
19
21
|
declare const _default: {
|
|
20
22
|
convert: typeof convert;
|
|
21
23
|
};
|
|
@@ -29,4 +31,4 @@ export default _default;
|
|
|
29
31
|
* @param {string} args.applicationType - the application's type
|
|
30
32
|
* @returns {Map} entities that can be exported to JSON
|
|
31
33
|
*/
|
|
32
|
-
export declare function convert(args
|
|
34
|
+
export declare function convert(args: JdlObjectWrapper): Map<string, JSONEntity[]>;
|
|
@@ -16,5 +16,12 @@
|
|
|
16
16
|
* See the License for the specific language governing permissions and
|
|
17
17
|
* limitations under the License.
|
|
18
18
|
*/
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
import JDLObject from '../models/jdl-object.js';
|
|
20
|
+
import { JHipsterYoRcContent, JHipsterYoRcContentWrapper } from './types.js';
|
|
21
|
+
type JHipsterYoRcContentAndJDLWrapper = {
|
|
22
|
+
applications?: JHipsterYoRcContent[];
|
|
23
|
+
jdl?: JDLObject;
|
|
24
|
+
};
|
|
25
|
+
export declare function convertApplicationsToJDL({ applications, jdl }?: JHipsterYoRcContentAndJDLWrapper): JDLObject;
|
|
26
|
+
export declare function convertApplicationToJDL({ application }?: JHipsterYoRcContentWrapper): import("../models/jdl-application.js").default;
|
|
27
|
+
export {};
|