generator-jhipster 7.6.0 → 7.7.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.
Files changed (310) hide show
  1. package/README.md +1 -3
  2. package/cli/commands.js +3 -0
  3. package/cli/environment-builder.js +53 -18
  4. package/cli/import-jdl.js +3 -0
  5. package/cli/index.mjs +20 -0
  6. package/cli/jhipster.js +19 -11
  7. package/cli/program.js +94 -38
  8. package/generators/app/esm.mjs +1 -3
  9. package/generators/app/index.js +1 -16
  10. package/generators/aws/esm.mjs +1 -3
  11. package/generators/azure-app-service/esm.mjs +1 -3
  12. package/generators/azure-spring-cloud/esm.mjs +1 -3
  13. package/generators/base/esm.mjs +1 -3
  14. package/generators/bootstrap/esm.mjs +1 -3
  15. package/generators/bootstrap/index.js +36 -86
  16. package/generators/bootstrap-application/esm.mjs +19 -0
  17. package/generators/bootstrap-application/generator.mjs +353 -0
  18. package/generators/bootstrap-application/index.mjs +19 -0
  19. package/generators/ci-cd/esm.mjs +1 -3
  20. package/generators/ci-cd/prompts.js +1 -1
  21. package/generators/ci-cd/templates/github-actions.yml.ejs +2 -2
  22. package/generators/client/esm.mjs +5 -3
  23. package/generators/client/files-angular.js +9 -0
  24. package/generators/client/files-common.js +8 -7
  25. package/generators/client/files-vue.js +7 -6
  26. package/generators/client/index.js +2 -1
  27. package/generators/client/templates/angular/angular.json.ejs +1 -1
  28. package/generators/client/templates/angular/package.json +25 -22
  29. package/generators/client/templates/angular/package.json.ejs +5 -1
  30. package/generators/client/templates/angular/src/main/webapp/app/account/activate/activate.component.html.ejs +1 -1
  31. package/generators/client/templates/angular/src/main/webapp/app/account/password/password.component.html.ejs +7 -7
  32. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/finish/password-reset-finish.component.html.ejs +5 -5
  33. package/generators/client/templates/angular/src/main/webapp/app/account/password-reset/init/password-reset-init.component.html.ejs +3 -3
  34. package/generators/client/templates/angular/src/main/webapp/app/account/register/register.component.html.ejs +10 -10
  35. package/generators/client/templates/angular/src/main/webapp/app/account/settings/settings.component.html.ejs +8 -8
  36. package/generators/client/templates/angular/src/main/webapp/app/admin/configuration/configuration.component.html.ejs +2 -2
  37. package/generators/client/templates/angular/src/main/webapp/app/admin/gateway/gateway.component.html.ejs +5 -5
  38. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.html.ejs +1 -1
  39. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.spec.ts.ejs +2 -2
  40. package/generators/client/templates/angular/src/main/webapp/app/admin/health/health.component.ts.ejs +2 -2
  41. package/generators/client/templates/angular/src/main/webapp/app/admin/health/modal/health-modal.component.html.ejs +6 -6
  42. package/generators/client/templates/angular/src/main/webapp/app/admin/logs/logs.component.html.ejs +51 -49
  43. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-cache/metrics-cache.component.html.ejs +16 -16
  44. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html.ejs +32 -32
  45. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html.ejs +4 -4
  46. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html.ejs +18 -18
  47. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html.ejs +12 -12
  48. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts.ejs +4 -4
  49. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-request/metrics-request.component.html.ejs +4 -4
  50. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/blocks/metrics-system/metrics-system.component.html.ejs +8 -8
  51. package/generators/client/templates/angular/src/main/webapp/app/admin/metrics/metrics.component.html.ejs +1 -1
  52. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/delete/user-management-delete-dialog.component.html.ejs +1 -1
  53. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/detail/user-management-detail.component.html.ejs +4 -4
  54. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/list/user-management.component.html.ejs +5 -5
  55. package/generators/client/templates/angular/src/main/webapp/app/admin/user-management/update/user-management-update.component.html.ejs +11 -11
  56. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.html.ejs +4 -2
  57. package/generators/client/templates/angular/src/main/webapp/app/layouts/navbar/navbar.component.scss.ejs +0 -6
  58. package/generators/client/templates/angular/src/main/webapp/app/layouts/profiles/page-ribbon.component.scss.ejs +0 -6
  59. package/generators/client/templates/angular/src/main/webapp/app/login/login.component.html.ejs +3 -3
  60. package/generators/client/templates/angular/src/main/webapp/content/scss/_bootstrap-variables.scss.ejs +5 -5
  61. package/generators/client/templates/angular/src/main/webapp/content/scss/global.scss.ejs +29 -0
  62. package/generators/client/templates/angular/src/main/webapp/content/scss/vendor.scss.ejs +0 -4
  63. package/generators/client/templates/angular/webpack/webpack.custom.js.ejs +19 -0
  64. package/generators/client/templates/common/package.json +2 -2
  65. package/generators/client/templates/common/src/main/webapp/swagger-ui/index.html.ejs +1 -7
  66. package/generators/client/templates/react/package.json +33 -33
  67. package/generators/client/templates/vue/package.json +23 -23
  68. package/generators/client/templates/vue/src/main/webapp/app/core/jhi-navbar/jhi-navbar.component.ts.ejs +3 -3
  69. package/generators/client/templates/vue/src/main/webapp/app/entities/user/user.service.ts.ejs +0 -0
  70. package/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +29 -1
  71. package/generators/client/templates/vue/src/main/webapp/app/shared/config/axios-interceptor.ts.ejs +2 -2
  72. package/generators/client/templates/vue/src/main/webapp/app/shared/config/config.ts.ejs +0 -4
  73. package/generators/cloudfoundry/esm.mjs +1 -3
  74. package/generators/common/esm.mjs +2 -3
  75. package/generators/common/files.js +1 -2
  76. package/generators/common/index.js +6 -0
  77. package/generators/common/templates/.husky/{pre-commit → pre-commit.ejs} +4 -0
  78. package/generators/common/templates/README.md.jhi.ejs +3 -1
  79. package/generators/common/templates/package.json +3 -3
  80. package/generators/common/templates/sonar-project.properties.ejs +1 -1
  81. package/generators/cypress/esm.mjs +2 -3
  82. package/generators/cypress/files.js +2 -1
  83. package/generators/cypress/templates/src/test/javascript/cypress/integration/account/settings-page.spec.ts.ejs +18 -14
  84. package/generators/database-changelog/esm.mjs +1 -3
  85. package/generators/database-changelog/index.js +1 -1
  86. package/generators/database-changelog-liquibase/esm.mjs +2 -3
  87. package/generators/docker-compose/esm.mjs +1 -3
  88. package/generators/entities/esm.mjs +1 -3
  89. package/generators/entities/index.js +2 -2
  90. package/generators/entities-client/esm.mjs +1 -3
  91. package/generators/entity/esm.mjs +1 -3
  92. package/generators/entity/index.js +11 -15
  93. package/generators/entity/prompts.js +4 -1
  94. package/generators/entity-client/esm.mjs +2 -3
  95. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/delete/entity-management-delete-dialog.component.html.ejs +1 -1
  96. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/detail/entity-management-detail.component.html.ejs +2 -2
  97. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/list/entity-management.component.html.ejs +20 -21
  98. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.html.ejs +14 -16
  99. package/generators/entity-client/templates/angular/src/main/webapp/app/entities/update/entity-management-update.component.ts.ejs +2 -2
  100. package/generators/entity-client/templates/common/src/test/javascript/cypress/integration/entity/entity.spec.ts.ejs +1 -1
  101. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-reducer.spec.ts.ejs +1 -1
  102. package/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs +1 -1
  103. package/generators/entity-client/templates/react/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
  104. package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity-update-page-object.ts.ejs +1 -1
  105. package/generators/entity-client/templates/vue/src/test/javascript/e2e/entities/entity.spec.ts.ejs +1 -1
  106. package/generators/entity-i18n/esm.mjs +2 -3
  107. package/generators/entity-server/esm.mjs +2 -3
  108. package/generators/entity-server/files-couchbase.js +23 -2
  109. package/generators/entity-server/files.js +16 -2
  110. package/generators/entity-server/index.js +8 -1
  111. package/generators/entity-server/templates/couchbase/src/main/java/package/domain/Entity.java.jhi.spring_data_couchbase.ejs +11 -13
  112. package/generators/entity-server/templates/couchbase/src/main/java/package/repository/EntityRepository.java.ejs +23 -59
  113. package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.fts.ejs +5 -6
  114. package/generators/entity-server/templates/couchbase/src/main/resources/config/couchmove/changelog/entity.n1ql.ejs +5 -0
  115. package/generators/entity-server/templates/partials/it_patch_update.partial.java.ejs +2 -2
  116. package/generators/entity-server/templates/partials/save_template.ejs +1 -1
  117. package/generators/entity-server/templates/src/main/java/package/common/get_all_template.ejs +1 -1
  118. package/generators/entity-server/templates/src/main/java/package/common/inject_template.ejs +4 -4
  119. package/generators/entity-server/templates/src/main/java/package/common/patch_template.ejs +3 -3
  120. package/generators/entity-server/templates/src/main/java/package/common/search_stream_template.ejs +1 -1
  121. package/generators/entity-server/templates/src/main/java/package/common/search_template.ejs +1 -1
  122. package/generators/entity-server/templates/src/main/java/package/domain/Entity.java.jhi.ejs +2 -2
  123. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository.java.ejs +31 -18
  124. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryInternalImpl_reactive.java.ejs +3 -3
  125. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationships.java.ejs +37 -0
  126. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepositoryWithBagRelationshipsImpl.java.ejs +90 -0
  127. package/generators/entity-server/templates/src/main/java/package/repository/EntityRepository_reactive.java.ejs +2 -2
  128. package/generators/entity-server/templates/src/main/java/package/repository/rowmapper/EntityRowMapper.java.ejs +1 -1
  129. package/generators/entity-server/templates/src/main/java/package/repository/search/EntitySearchRepository.java.ejs +3 -5
  130. package/generators/entity-server/templates/src/main/java/package/repository/search/{SortToFieldSortBuilderConverter.java.ejs → SortToSortBuilderListConverter.java.ejs} +4 -3
  131. package/generators/entity-server/templates/src/main/java/package/service/criteria/EntityCriteria.java.ejs +8 -6
  132. package/generators/entity-server/templates/src/main/java/package/service/impl/EntityServiceImpl.java.ejs +1 -1
  133. package/generators/entity-server/templates/src/main/java/package/service/mapper/EntityMapper.java.ejs +6 -6
  134. package/generators/entity-server/templates/src/main/java/package/web/rest/EntityResource.java.ejs +1 -1
  135. package/generators/entity-server/templates/src/test/java/package/web/rest/EntityResourceIT.java.ejs +5 -5
  136. package/generators/export-jdl/esm.mjs +1 -3
  137. package/generators/gae/esm.mjs +1 -3
  138. package/generators/generate-blueprint/constants.mjs +146 -0
  139. package/generators/generate-blueprint/esm.mjs +19 -0
  140. package/generators/generate-blueprint/files.mjs +81 -0
  141. package/generators/generate-blueprint/generator.mjs +363 -0
  142. package/generators/generate-blueprint/index.mjs +20 -0
  143. package/generators/generate-blueprint/templates/.eslintrc.json.ejs +41 -0
  144. package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs +32 -0
  145. package/generators/generate-blueprint/templates/.mocharc.cjs.ejs +29 -0
  146. package/generators/{server/templates/couchbase/src/main/java/package/config/couchbase/package-info.java.ejs → generate-blueprint/templates/.prettierignore.jhi.blueprint.ejs} +4 -7
  147. package/generators/generate-blueprint/templates/README.md.ejs +75 -0
  148. package/generators/generate-blueprint/templates/cli/cli.mjs.ejs +35 -0
  149. package/generators/generate-blueprint/templates/cli/commands.cjs.ejs +25 -0
  150. package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs +98 -0
  151. package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs +42 -0
  152. package/generators/generate-blueprint/templates/generators/generator/index.mjs.ejs +19 -0
  153. package/generators/generate-blueprint/templates/generators/generator/templates/template-file.ejs +0 -0
  154. package/generators/generate-blueprint/templates/test/utils.mjs.ejs +17 -0
  155. package/generators/generator-base-blueprint.js +29 -0
  156. package/generators/generator-base-docker.js +1 -0
  157. package/generators/generator-base-entities.cjs +368 -0
  158. package/generators/generator-base.js +128 -23
  159. package/generators/generator-constants.js +18 -16
  160. package/generators/generator-list.js +2 -0
  161. package/generators/gradle/esm.mjs +19 -0
  162. package/generators/heroku/esm.mjs +1 -3
  163. package/generators/info/esm.mjs +1 -3
  164. package/generators/init/esm.mjs +19 -0
  165. package/generators/init/files.cjs +9 -3
  166. package/generators/init/index.cjs +5 -0
  167. package/generators/init/templates/.gitignore.jhi.ejs +5 -0
  168. package/generators/init/templates/{.lintstagedrc.js.ejs → .lintstagedrc.cjs.ejs} +0 -0
  169. package/generators/java/esm.mjs +19 -0
  170. package/generators/java/index.cjs +58 -2
  171. package/generators/kubernetes/esm.mjs +1 -3
  172. package/generators/kubernetes-helm/esm.mjs +1 -3
  173. package/generators/kubernetes-knative/esm.mjs +1 -3
  174. package/generators/languages/esm.mjs +2 -3
  175. package/generators/languages/templates/src/test/resources/i18n/messages_fr.properties.ejs +4 -1
  176. package/generators/maven/esm.mjs +19 -0
  177. package/generators/openapi-client/esm.mjs +1 -3
  178. package/generators/openapi-client/index.js +11 -4
  179. package/generators/openshift/esm.mjs +1 -3
  180. package/generators/page/esm.mjs +1 -3
  181. package/generators/project-name/esm.mjs +19 -0
  182. package/generators/server/esm.mjs +2 -2
  183. package/generators/server/files-couchbase.js +28 -31
  184. package/generators/server/files.js +14 -1
  185. package/generators/server/index.js +13 -13
  186. package/generators/server/needle-api/needle-server-maven.js +1 -1
  187. package/generators/server/templates/couchbase/src/main/java/package/repository/CouchbaseSearchRepository.java.ejs +91 -0
  188. package/generators/server/templates/couchbase/src/main/java/package/repository/JHipsterCouchbaseRepository.java.ejs +43 -64
  189. package/generators/server/templates/couchbase/src/main/java/package/repository/PersistentTokenRepository_couchbase.java.ejs +2 -2
  190. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_ADMIN.json.ejs +3 -0
  191. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/authority/ROLE_USER.json.ejs +3 -0
  192. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__admin.json.ejs → user/admin.json.ejs} +2 -2
  193. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/{user__user.json.ejs → user/user.json.ejs} +2 -2
  194. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.2__create_indexes.n1ql.ejs +34 -0
  195. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_collections.n1ql.ejs +8 -0
  196. package/generators/server/templates/couchbase/src/test/java/package/CouchbaseTestContainerExtension.java.ejs +4 -3
  197. package/generators/server/templates/couchbase/src/test/java/package/repository/{JHipsterCouchbaseRepositoryTest.java.ejs → CouchbaseSearchRepositoryTest.java.ejs} +2 -2
  198. package/generators/server/templates/gradle/profile_prod.gradle.ejs +4 -0
  199. package/generators/server/templates/gradle.properties.ejs +6 -6
  200. package/generators/server/templates/npmw +14 -5
  201. package/generators/server/templates/pom.xml.ejs +47 -42
  202. package/generators/server/templates/src/main/docker/app.yml.ejs +4 -2
  203. package/generators/server/templates/src/main/docker/zipkin.yml.ejs +25 -0
  204. package/generators/server/templates/src/main/java/package/config/DatabaseConfiguration_couchbase.java.ejs +26 -16
  205. package/generators/server/templates/src/main/java/package/config/LocaleConfiguration_reactive.java.ejs +1 -1
  206. package/generators/server/templates/src/main/java/package/config/SecurityConfiguration_reactive.java.ejs +2 -1
  207. package/generators/server/templates/src/main/java/package/domain/Authority.java.ejs +11 -0
  208. package/generators/server/templates/src/main/java/package/domain/PersistentToken.java.ejs +6 -6
  209. package/generators/server/templates/src/main/java/package/domain/User.java.ejs +9 -7
  210. package/generators/server/templates/src/main/java/package/repository/AuthorityRepository.java.ejs +1 -11
  211. package/generators/server/templates/src/main/java/package/repository/UserRepository.java.ejs +48 -72
  212. package/generators/server/templates/src/main/java/package/security/oauth2/CustomClaimConverter.java.ejs +1 -1
  213. package/generators/server/templates/src/main/java/package/service/UserService.java.ejs +8 -6
  214. package/generators/server/templates/src/main/java/package/web/filter/OAuth2ReactiveRefreshTokensWebFilter.java.ejs +0 -1
  215. package/generators/server/templates/src/main/java/package/web/rest/AccountResource.java.ejs +1 -1
  216. package/generators/server/templates/src/main/java/package/web/rest/LogoutResource_reactive.java.ejs +1 -1
  217. package/generators/server/templates/src/main/java/package/web/rest/PublicUserResource.java.ejs +2 -2
  218. package/generators/server/templates/src/main/resources/config/application-dev.yml.ejs +8 -0
  219. package/generators/server/templates/src/main/resources/config/application-prod.yml.ejs +6 -0
  220. package/generators/server/templates/src/main/resources/config/application.yml.ejs +2 -0
  221. package/generators/server/templates/src/test/java/package/IntegrationTest.java.ejs +3 -1
  222. package/generators/server/templates/src/test/java/package/TechnicalStructureTest.java.ejs +21 -15
  223. package/generators/server/templates/src/test/java/package/config/JHipsterBlockHoundIntegration.java.ejs +2 -0
  224. package/generators/server/templates/src/test/java/package/cucumber/stepdefs/StepDefs.java.ejs +8 -0
  225. package/generators/server/templates/src/test/java/package/cucumber/stepdefs/UserStepDefs.java.ejs +17 -3
  226. package/generators/server/templates/src/test/java/package/security/SecurityUtilsUnitTest_reactive.java.ejs +1 -1
  227. package/generators/server/templates/src/test/java/package/security/oauth2/CustomClaimConverterIT.java.ejs +1 -1
  228. package/generators/server/templates/src/test/java/package/service/mapper/UserMapperTest.java.ejs +1 -1
  229. package/generators/server/templates/src/test/java/package/web/rest/AccountResourceIT.java.ejs +13 -6
  230. package/generators/server/templates/src/test/java/package/web/rest/TestUtil.java.ejs +1 -6
  231. package/generators/server/templates/src/test/java/package/web/rest/UserResourceIT.java.ejs +40 -42
  232. package/generators/server/templates/src/test/java/package/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs +1 -1
  233. package/generators/spring-boot/esm.mjs +19 -0
  234. package/generators/spring-controller/esm.mjs +1 -3
  235. package/generators/spring-service/esm.mjs +1 -3
  236. package/generators/upgrade/esm.mjs +1 -3
  237. package/generators/upgrade-config/esm.mjs +1 -3
  238. package/generators/workspaces/esm.mjs +1 -3
  239. package/lib/constants/logo.cjs +30 -0
  240. package/lib/constants/priorities.cjs +216 -2
  241. package/lib/constants/priorities.mjs +29 -1
  242. package/lib/index.mjs +6 -0
  243. package/lib/support/mixin.cjs +5 -1
  244. package/lib/support/shared-data.cjs +34 -1
  245. package/package.json +27 -23
  246. package/utils/entity.js +19 -2
  247. package/utils/faker.js +3 -3
  248. package/utils/field.js +61 -49
  249. package/utils/relationship.js +5 -3
  250. package/utils/user.js +109 -0
  251. package/generators/app/generator.spec.mjs +0 -47
  252. package/generators/aws/generator.spec.mjs +0 -47
  253. package/generators/azure-app-service/generator.spec.mjs +0 -47
  254. package/generators/azure-spring-cloud/generator.spec.mjs +0 -47
  255. package/generators/base/generator.spec.mjs +0 -44
  256. package/generators/bootstrap/generator.spec.mjs +0 -44
  257. package/generators/ci-cd/generator.spec.mjs +0 -47
  258. package/generators/client/__workflow/devserver-angular.json +0 -13
  259. package/generators/client/__workflow/devserver-react.json +0 -13
  260. package/generators/client/__workflow/devserver-vue.json +0 -13
  261. package/generators/client/generator.spec.mjs +0 -47
  262. package/generators/cloudfoundry/generator.spec.mjs +0 -47
  263. package/generators/common/generator.spec.mjs +0 -47
  264. package/generators/cypress/generator.spec.mjs +0 -47
  265. package/generators/database-changelog/generator.spec.mjs +0 -47
  266. package/generators/database-changelog-liquibase/generator.spec.mjs +0 -47
  267. package/generators/docker-compose/generator.spec.mjs +0 -44
  268. package/generators/entities/generator.spec.mjs +0 -47
  269. package/generators/entities-client/generator.spec.mjs +0 -47
  270. package/generators/entity/generator.spec.mjs +0 -47
  271. package/generators/entity-client/generator.spec.mjs +0 -47
  272. package/generators/entity-i18n/generator.spec.mjs +0 -47
  273. package/generators/entity-server/generator.spec.mjs +0 -47
  274. package/generators/export-jdl/generator.spec.mjs +0 -44
  275. package/generators/gae/generator.spec.mjs +0 -47
  276. package/generators/gradle/__snapshots__/generator.spec.cjs.snap +0 -59
  277. package/generators/gradle/generator.spec.cjs +0 -71
  278. package/generators/heroku/generator.spec.mjs +0 -47
  279. package/generators/info/generator.spec.mjs +0 -44
  280. package/generators/init/__snapshots__/generator.spec.cjs.snap +0 -65
  281. package/generators/init/generator.spec.cjs +0 -112
  282. package/generators/java/__snapshots__/generator.spec.cjs.snap +0 -118
  283. package/generators/java/generator.spec.cjs +0 -87
  284. package/generators/kubernetes/generator.spec.mjs +0 -44
  285. package/generators/kubernetes-helm/generator.spec.mjs +0 -44
  286. package/generators/kubernetes-knative/generator.spec.mjs +0 -44
  287. package/generators/languages/generator.spec.mjs +0 -47
  288. package/generators/maven/__snapshots__/generator.spec.cjs.snap +0 -53
  289. package/generators/maven/generator.spec.cjs +0 -78
  290. package/generators/openapi-client/generator.spec.mjs +0 -47
  291. package/generators/openshift/generator.spec.mjs +0 -44
  292. package/generators/page/generator.spec.mjs +0 -47
  293. package/generators/project-name/generator.spec.cjs +0 -43
  294. package/generators/server/__snapshots__/generator.spec.mjs.snap +0 -1931
  295. package/generators/server/generator.spec.mjs +0 -52
  296. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactory.java.ejs +0 -83
  297. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryFactoryBean.java.ejs +0 -40
  298. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomCouchbaseRepositoryQuery.java.ejs +0 -44
  299. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlQueryCreator.java.ejs +0 -162
  300. package/generators/server/templates/couchbase/src/main/java/package/config/couchbase/CustomN1qlRepositoryQueryExecutor.java.ejs +0 -104
  301. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_ADMIN.json.ejs +0 -3
  302. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0.1__initial_setup/ROLE_USER.json.ejs +0 -3
  303. package/generators/server/templates/couchbase/src/main/resources/config/couchmove/changelog/V0__create_indexes.n1ql.ejs +0 -19
  304. package/generators/spring-boot/__snapshots__/generator.spec.cjs.snap +0 -80
  305. package/generators/spring-boot/generator.spec.cjs +0 -64
  306. package/generators/spring-controller/generator.spec.mjs +0 -47
  307. package/generators/spring-service/generator.spec.mjs +0 -47
  308. package/generators/upgrade/generator.spec.mjs +0 -44
  309. package/generators/upgrade-config/generator.spec.mjs +0 -44
  310. package/generators/workspaces/generator.spec.mjs +0 -47
@@ -51,7 +51,6 @@ import javax.persistence.criteria.Root;
51
51
  <%_ if (searchEngineCouchbase) { _%>
52
52
  import java.util.NoSuchElementException;
53
53
  import java.util.concurrent.Callable;
54
- import java.util.concurrent.TimeUnit;
55
54
  import java.util.function.Function;
56
55
  import java.time.Duration;
57
56
  import reactor.core.publisher.Mono;
@@ -65,10 +64,6 @@ import static org.assertj.core.api.Assertions.assertThat;
65
64
  public final class TestUtil {
66
65
 
67
66
  private static final ObjectMapper mapper = createObjectMapper();
68
- <%_ if (searchEngineCouchbase) { _%>
69
- private static final int MAX_ATTEMPTS = 3;
70
- // private static final Delay DEFAULT_DELAY = Delay.exponential(TimeUnit.SECONDS);
71
- <%_ } _%>
72
67
 
73
68
  private static ObjectMapper createObjectMapper() {
74
69
  ObjectMapper mapper = new ObjectMapper();
@@ -267,7 +262,7 @@ public final class TestUtil {
267
262
  .switchIfEmpty(Mono.error(new NoSuchElementException()))
268
263
  )
269
264
  .retry()
270
- .timeout(Duration.ofSeconds(5))
265
+ .timeout(Duration.ofSeconds(60))
271
266
  .block();
272
267
  }
273
268
 
@@ -128,7 +128,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
128
128
  <%_ } _%>
129
129
 
130
130
  <%_ if (databaseTypeCouchbase) { _%>
131
- private static final String DEFAULT_ID = <%= asEntity('User') %>.PREFIX + DEFAULT_LOGIN;
131
+ private static final String DEFAULT_ID = DEFAULT_LOGIN;
132
132
  <%_ } else { _%>
133
133
  private static final <%= user.primaryKey.type %> DEFAULT_ID = <%- getPrimaryKeyValue(user.primaryKey.type) %>;
134
134
  <%_ } _%>
@@ -266,7 +266,7 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
266
266
  /**
267
267
  * Setups the database with one user.
268
268
  */
269
- public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql ) { %>, EntityManager em<% } _%>) {
269
+ public static <%= asEntity('User') %> initTestUser(UserRepository userRepository<% if (databaseTypeSql) { %>, EntityManager em<% } _%>) {
270
270
  <%_ if (databaseTypeSql && reactive) { _%>
271
271
  userRepository.deleteAllUserAuthorities().block();
272
272
  <%_ } _%>
@@ -336,9 +336,9 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
336
336
  assertThat(testUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
337
337
  assertThat(testUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
338
338
  assertThat(testUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
339
- <%_ if (!databaseTypeCassandra) { _%>
339
+ <%_ if (!databaseTypeCassandra) { _%>
340
340
  assertThat(testUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
341
- <%_ } _%>
341
+ <%_ } _%>
342
342
  assertThat(testUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
343
343
  });
344
344
  }
@@ -479,24 +479,23 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
479
479
  // Validate the User in the database
480
480
  assertPersistedUsers(users -> assertThat(users).hasSize(databaseSizeBeforeCreate));
481
481
  }
482
- <%_ } _%>
483
482
 
484
483
  @Test
485
- <%_ if (databaseTypeSql && !reactive) { _%>
484
+ <%_ if (databaseTypeSql && !reactive) { _%>
486
485
  @Transactional
487
- <%_ } _%>
486
+ <%_ } _%>
488
487
  void getAllUsers()<% if (!reactive) { %> throws Exception<% } %> {
489
488
  // Initialize the database
490
489
  userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
491
- <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
490
+ <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
492
491
  authorityRepository
493
492
  .findById(AuthoritiesConstants.USER)
494
493
  .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
495
494
  .block();
496
- <%_ } _%>
495
+ <%_ } _%>
497
496
 
498
497
  // Get all the users
499
- <%_ if (reactive) { _%>
498
+ <%_ if (reactive) { _%>
500
499
  <%= asDto('AdminUser') %> foundUser = webTestClient.get().uri("/api/admin/users?sort=id,DESC")
501
500
  .accept(MediaType.APPLICATION_JSON)
502
501
  .exchange()
@@ -508,14 +507,14 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
508
507
  assertThat(foundUser.getFirstName()).isEqualTo(DEFAULT_FIRSTNAME);
509
508
  assertThat(foundUser.getLastName()).isEqualTo(DEFAULT_LASTNAME);
510
509
  assertThat(foundUser.getEmail()).isEqualTo(DEFAULT_EMAIL);
511
- <%_ if (!databaseTypeCassandra) { _%>
510
+ <%_ if (!databaseTypeCassandra) { _%>
512
511
  assertThat(foundUser.getImageUrl()).isEqualTo(DEFAULT_IMAGEURL);
513
- <%_ } _%>
512
+ <%_ } _%>
514
513
  assertThat(foundUser.getLangKey()).isEqualTo(DEFAULT_LANGKEY);
515
- <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
514
+ <%_ if (databaseTypeSql && !applicationTypeMicroservice) { _%>
516
515
  assertThat(foundUser.getAuthorities()).containsExactly(AuthoritiesConstants.USER);
517
- <%_ } _%>
518
- <%_ } else { _%>
516
+ <%_ } _%>
517
+ <%_ } else { _%>
519
518
  restUserMockMvc.perform(get("/api/admin/users<% if (databaseTypeSql) { %>?sort=id,desc<% } %>")
520
519
  .accept(MediaType.APPLICATION_JSON))
521
520
  .andExpect(status().isOk())
@@ -524,37 +523,37 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
524
523
  .andExpect(jsonPath("$.[*].firstName").value(hasItem(DEFAULT_FIRSTNAME)))
525
524
  .andExpect(jsonPath("$.[*].lastName").value(hasItem(DEFAULT_LASTNAME)))
526
525
  .andExpect(jsonPath("$.[*].email").value(hasItem(DEFAULT_EMAIL)))
527
- <%_ if (!databaseTypeCassandra) { _%>
526
+ <%_ if (!databaseTypeCassandra) { _%>
528
527
  .andExpect(jsonPath("$.[*].imageUrl").value(hasItem(DEFAULT_IMAGEURL)))
529
- <%_ } _%>
528
+ <%_ } _%>
530
529
  .andExpect(jsonPath("$.[*].langKey").value(hasItem(DEFAULT_LANGKEY)));
531
- <%_ } _%>
530
+ <%_ } _%>
532
531
  }
533
532
 
534
533
  @Test
535
- <%_ if (databaseTypeSql && !reactive) { _%>
534
+ <%_ if (databaseTypeSql && !reactive) { _%>
536
535
  @Transactional
537
- <%_ } _%>
536
+ <%_ } _%>
538
537
  void getUser()<% if (!reactive) { %> throws Exception<% } %> {
539
538
  // Initialize the database
540
539
  userRepository.<% if (databaseTypeSql && reactive && authenticationTypeOauth2) { %>create<% } else { %>save<% } %><% if (databaseTypeSql && !reactive) { %>AndFlush<% } %>(user)<% if (reactive) { %>.block()<% } %>;
541
- <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
540
+ <%_ if (databaseTypeSql && reactive && !applicationTypeMicroservice) { _%>
542
541
  authorityRepository
543
542
  .findById(AuthoritiesConstants.USER)
544
543
  .flatMap(authority -> userRepository.saveUserAuthority(user.getId(), authority.getName()))
545
544
  .block();
546
- <%_ } _%>
545
+ <%_ } _%>
547
546
 
548
- <%_ if (searchEngineElasticsearch) { _%>
547
+ <%_ if (searchEngineElasticsearch) { _%>
549
548
  mockUserSearchRepository.save(user);
550
- <%_ } _%>
551
- <%_ if (cacheManagerIsAvailable) { _%>
549
+ <%_ } _%>
550
+ <%_ if (cacheManagerIsAvailable) { _%>
552
551
 
553
552
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNull();
554
- <%_ } _%>
553
+ <%_ } _%>
555
554
 
556
555
  // Get the user
557
- <%_ if (reactive) { _%>
556
+ <%_ if (reactive) { _%>
558
557
  webTestClient.get().uri("/api/admin/users/{login}", user.getLogin())
559
558
  .exchange()
560
559
  .expectStatus().isOk()
@@ -564,16 +563,16 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
564
563
  .jsonPath("$.firstName").isEqualTo(DEFAULT_FIRSTNAME)
565
564
  .jsonPath("$.lastName").isEqualTo(DEFAULT_LASTNAME)
566
565
  .jsonPath("$.email").isEqualTo(DEFAULT_EMAIL)
567
- <%_ if (!databaseTypeCassandra) { _%>
566
+ <%_ if (!databaseTypeCassandra) { _%>
568
567
  .jsonPath("$.imageUrl").isEqualTo(DEFAULT_IMAGEURL)
569
- <%_ } _%>
568
+ <%_ } _%>
570
569
  .jsonPath("$.langKey").isEqualTo(DEFAULT_LANGKEY)<%
571
570
  if (!databaseTypeSql || applicationTypeMicroservice) { %>;
572
571
  <%_ } else { _%>
573
572
  .jsonPath("$.authorities")
574
573
  .isEqualTo(AuthoritiesConstants.USER);
575
574
  <% } %>
576
- <%_ } else { _%>
575
+ <%_ } else { _%>
577
576
  restUserMockMvc.perform(get("/api/admin/users/{login}", user.getLogin()))
578
577
  .andExpect(status().isOk())
579
578
  .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
@@ -581,36 +580,35 @@ class UserResourceIT <% if (databaseTypeCassandra) { %>extends AbstractCassandra
581
580
  .andExpect(jsonPath("$.firstName").value(DEFAULT_FIRSTNAME))
582
581
  .andExpect(jsonPath("$.lastName").value(DEFAULT_LASTNAME))
583
582
  .andExpect(jsonPath("$.email").value(DEFAULT_EMAIL))
584
- <%_ if (!databaseTypeCassandra) { _%>
583
+ <%_ if (!databaseTypeCassandra) { _%>
585
584
  .andExpect(jsonPath("$.imageUrl").value(DEFAULT_IMAGEURL))
586
- <%_ } _%>
585
+ <%_ } _%>
587
586
  .andExpect(jsonPath("$.langKey").value(DEFAULT_LANGKEY));
588
- <%_ } _%>
587
+ <%_ } _%>
589
588
 
590
- <%_ if (cacheProviderMemcached) { _%>
589
+ <%_ if (cacheProviderMemcached) { _%>
591
590
  if (!(cacheManager instanceof NoOpCacheManager)) {
592
591
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
593
592
  }
594
- <%_ } else if (cacheManagerIsAvailable) { _%>
593
+ <%_ } else if (cacheManagerIsAvailable) { _%>
595
594
  assertThat(cacheManager.getCache(UserRepository.USERS_BY_LOGIN_CACHE).get(user.getLogin())).isNotNull();
596
- <%_ } _%>
595
+ <%_ } _%>
597
596
  }
598
597
 
599
598
  @Test
600
- <%_ if (databaseTypeSql && !reactive) { _%>
599
+ <%_ if (databaseTypeSql && !reactive) { _%>
601
600
  @Transactional
602
- <%_ } _%>
601
+ <%_ } _%>
603
602
  void getNonExistingUser()<% if (!reactive) { %> throws Exception<% } %> {
604
- <%_ if (reactive) { _%>
603
+ <%_ if (reactive) { _%>
605
604
  webTestClient.get().uri("/api/admin/users/unknown")
606
605
  .exchange()
607
606
  .expectStatus().isNotFound();
608
- <%_ } else { _%>
607
+ <%_ } else { _%>
609
608
  restUserMockMvc.perform(get("/api/admin/users/unknown"))
610
609
  .andExpect(status().isNotFound());
611
- <%_ } _%>
610
+ <%_ } _%>
612
611
  }
613
- <%_ if (!authenticationTypeOauth2) { _%>
614
612
 
615
613
  @Test
616
614
  <%_ if (databaseTypeSql && !reactive) { _%>
@@ -1,5 +1,5 @@
1
1
  <%#
2
- Copyright 2013-2021 the original author or authors from the JHipster project.
2
+ Copyright 2013-2022 the original author or authors from the JHipster project.
3
3
 
4
4
  This file is part of the JHipster project, see https://www.jhipster.tech/
5
5
  for more information.
@@ -0,0 +1,19 @@
1
+ /**
2
+ * Copyright 2013-2022 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 { default } from './index.cjs';
@@ -16,6 +16,4 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import generator from './index.js';
20
-
21
- export default generator;
19
+ export { default } from './index.js';
@@ -16,6 +16,4 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import generator from './index.js';
20
-
21
- export default generator;
19
+ export { default } from './index.js';
@@ -16,6 +16,4 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import generator from './index.js';
20
-
21
- export default generator;
19
+ export { default } from './index.js';
@@ -16,6 +16,4 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import generator from './index.js';
20
-
21
- export default generator;
19
+ export { default } from './index.js';
@@ -16,6 +16,4 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- import generator from './index.js';
20
-
21
- export default generator;
19
+ export { default } from './index.js';
@@ -0,0 +1,30 @@
1
+ /**
2
+ * Copyright 2013-2022 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
+ const chalk = require('chalk');
20
+ const packagejs = require('../../package.json');
21
+
22
+ module.exports.logo = `${chalk.green(' ██╗')}${chalk.red(' ██╗ ██╗ ████████╗ ███████╗ ██████╗ ████████╗ ████████╗ ███████╗')}
23
+ ${chalk.green(' ██║')}${chalk.red(' ██║ ██║ ╚══██╔══╝ ██╔═══██╗ ██╔════╝ ╚══██╔══╝ ██╔═════╝ ██╔═══██╗')}
24
+ ${chalk.green(' ██║')}${chalk.red(' ████████║ ██║ ███████╔╝ ╚█████╗ ██║ ██████╗ ███████╔╝')}
25
+ ${chalk.green(' ██╗ ██║')}${chalk.red(' ██╔═══██║ ██║ ██╔════╝ ╚═══██╗ ██║ ██╔═══╝ ██╔══██║')}
26
+ ${chalk.green(' ╚██████╔╝')}${chalk.red(' ██║ ██║ ████████╗ ██║ ██████╔╝ ██║ ████████╗ ██║ ╚██╗')}
27
+ ${chalk.green(' ╚═════╝ ')}${chalk.red(' ╚═╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══════╝ ╚═╝ ╚═╝')}
28
+ https://www.jhipster.tech
29
+ ${chalk.white('Welcome to JHipster')} ${chalk.yellow(`v${packagejs.version}`)}
30
+ `;
@@ -57,18 +57,50 @@ const PREPARING = 'preparing';
57
57
  const PREPARING_PRIORITY = `${PRIORITY_PREFIX}${PREPARING}`;
58
58
  const PREPARING_QUEUE = `${QUEUE_PREFIX}${PREPARING}`;
59
59
 
60
+ const CONFIGURING_EACH_ENTITY = 'configuringEachEntity';
61
+ const CONFIGURING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${CONFIGURING_EACH_ENTITY}`;
62
+ const CONFIGURING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${CONFIGURING_EACH_ENTITY}`;
63
+
64
+ const LOADING_EACH_ENTITY = 'loadingEachEntity';
65
+ const LOADING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${LOADING_EACH_ENTITY}`;
66
+ const LOADING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${LOADING_EACH_ENTITY}`;
67
+
68
+ const PREPARING_EACH_ENTITY = 'preparingEachEntity';
69
+ const PREPARING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY}`;
70
+ const PREPARING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY}`;
71
+
60
72
  const PREPARING_FIELDS = 'preparingFields';
61
73
  const PREPARING_FIELDS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_FIELDS}`;
62
74
  const PREPARING_FIELDS_QUEUE = `${QUEUE_PREFIX}${PREPARING_FIELDS}`;
63
75
 
76
+ const PREPARING_EACH_ENTITY_FIELD = 'preparingEachEntityField';
77
+ const PREPARING_EACH_ENTITY_FIELD_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY_FIELD}`;
78
+ const PREPARING_EACH_ENTITY_FIELD_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY_FIELD}`;
79
+
64
80
  const PREPARING_RELATIONSHIPS = 'preparingRelationships';
65
81
  const PREPARING_RELATIONSHIPS_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_RELATIONSHIPS}`;
66
82
  const PREPARING_RELATIONSHIPS_QUEUE = `${QUEUE_PREFIX}${PREPARING_RELATIONSHIPS}`;
67
83
 
84
+ const PREPARING_EACH_ENTITY_RELATIONSHIP = 'preparingEachEntityRelationship';
85
+ const PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY = `${PRIORITY_PREFIX}${PREPARING_EACH_ENTITY_RELATIONSHIP}`;
86
+ const PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE = `${QUEUE_PREFIX}${PREPARING_EACH_ENTITY_RELATIONSHIP}`;
87
+
88
+ const POST_PREPARING_EACH_ENTITY = 'postPreparingEachEntity';
89
+ const POST_PREPARING_EACH_ENTITY_PRIORITY = `${PRIORITY_PREFIX}${POST_PREPARING_EACH_ENTITY}`;
90
+ const POST_PREPARING_EACH_ENTITY_QUEUE = `${QUEUE_PREFIX}${POST_PREPARING_EACH_ENTITY}`;
91
+
92
+ const WRITING_ENTITIES = 'writingEntities';
93
+ const WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${WRITING_ENTITIES}`;
94
+ const WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${WRITING_ENTITIES}`;
95
+
68
96
  const POST_WRITING = 'postWriting';
69
97
  const POST_WRITING_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING}`;
70
98
  const POST_WRITING_QUEUE = `${QUEUE_PREFIX}${POST_WRITING}`;
71
99
 
100
+ const POST_WRITING_ENTITIES = 'postWritingEntities';
101
+ const POST_WRITING_ENTITIES_PRIORITY = `${PRIORITY_PREFIX}${POST_WRITING_ENTITIES}`;
102
+ const POST_WRITING_ENTITIES_QUEUE = `${QUEUE_PREFIX}${POST_WRITING_ENTITIES}`;
103
+
72
104
  /** @private */
73
105
  const PRE_CONFLICTS = 'preConflicts';
74
106
  /** @private */
@@ -89,59 +121,122 @@ const CUSTOM_PRIORITIES = [
89
121
  priorityName: LOADING,
90
122
  queueName: LOADING_QUEUE,
91
123
  before: PREPARING,
124
+ args: generator => generator.getArgsForPriority(LOADING),
92
125
  },
93
126
  {
94
127
  priorityName: PREPARING,
95
128
  queueName: PREPARING_QUEUE,
96
129
  before: PREPARING_FIELDS,
130
+ args: generator => generator.getArgsForPriority(PREPARING),
97
131
  },
98
132
  {
99
133
  priorityName: PREPARING_FIELDS,
100
134
  queueName: PREPARING_FIELDS_QUEUE,
101
135
  before: PREPARING_RELATIONSHIPS,
136
+ args: generator => generator.getArgsForPriority(PREPARING_FIELDS),
102
137
  },
103
138
  {
104
139
  priorityName: PREPARING_RELATIONSHIPS,
105
140
  queueName: PREPARING_RELATIONSHIPS_QUEUE,
106
141
  before: DEFAULT,
142
+ args: generator => generator.getArgsForPriority(PREPARING_RELATIONSHIPS),
143
+ },
144
+ {
145
+ priorityName: DEFAULT,
146
+ args: generator => generator.getArgsForPriority(DEFAULT),
147
+ edit: true,
148
+ },
149
+ {
150
+ priorityName: WRITING,
151
+ args: generator => generator.getArgsForPriority(WRITING),
152
+ edit: true,
107
153
  },
108
154
  {
109
155
  priorityName: POST_WRITING,
110
156
  queueName: POST_WRITING_QUEUE,
111
157
  before: PRE_CONFLICTS,
158
+ args: generator => generator.getArgsForPriority(POST_WRITING),
112
159
  },
113
160
  {
114
161
  priorityName: PRE_CONFLICTS,
115
162
  queueName: PRE_CONFLICTS_QUEUE,
163
+ args: generator => generator.getArgsForPriority(PRE_CONFLICTS),
116
164
  before: CONFLICTS,
117
165
  },
166
+ {
167
+ priorityName: INSTALL,
168
+ args: generator => generator.getArgsForPriority(INSTALL),
169
+ edit: true,
170
+ },
171
+ {
172
+ priorityName: END,
173
+ args: generator => generator.getArgsForPriority(END),
174
+ edit: true,
175
+ },
118
176
  ].reverse();
119
177
 
120
178
  const compat = {
179
+ PRIORITY_PREFIX: '',
121
180
  INITIALIZING_PRIORITY: INITIALIZING,
122
181
  PROMPTING_PRIORITY: PROMPTING,
123
182
  CONFIGURING_PRIORITY: CONFIGURING,
124
183
  COMPOSING_PRIORITY: COMPOSING,
125
184
  LOADING_PRIORITY: LOADING,
126
185
  PREPARING_PRIORITY: PREPARING,
186
+
187
+ CONFIGURING_EACH_ENTITY_PRIORITY: CONFIGURING_EACH_ENTITY,
188
+ LOADING_EACH_ENTITY_PRIORITY: LOADING_EACH_ENTITY,
189
+ PREPARING_EACH_ENTITY_PRIORITY: PREPARING_EACH_ENTITY,
127
190
  PREPARING_FIELDS_PRIORITY: PREPARING_FIELDS,
191
+ PREPARING_EACH_ENTITY_FIELD_PRIORITY: PREPARING_EACH_ENTITY_FIELD,
128
192
  PREPARING_RELATIONSHIPS_PRIORITY: PREPARING_RELATIONSHIPS,
193
+ PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY: PREPARING_EACH_ENTITY_RELATIONSHIP,
194
+ POST_PREPARING_EACH_ENTITY_PRIORITY: POST_PREPARING_EACH_ENTITY,
195
+
129
196
  DEFAULT_PRIORITY: DEFAULT,
130
197
  WRITING_PRIORITY: WRITING,
198
+ WRITING_ENTITIES_PRIORITY: WRITING_ENTITIES,
131
199
  POST_WRITING_PRIORITY: POST_WRITING,
200
+ POST_WRITING_ENTITIES_PRIORITY: POST_WRITING_ENTITIES,
201
+ PRE_CONFLICTS_PRIORITY: PRE_CONFLICTS,
132
202
  INSTALL_PRIORITY: INSTALL,
133
203
  END_PRIORITY: END,
134
204
  };
135
205
 
136
- const PRIORITY_NAMES = [
206
+ const PRIORITY_NAMES = {
137
207
  INITIALIZING,
138
208
  PROMPTING,
139
209
  CONFIGURING,
140
210
  COMPOSING,
141
211
  LOADING,
142
212
  PREPARING,
213
+
214
+ CONFIGURING_EACH_ENTITY,
215
+ LOADING_EACH_ENTITY,
216
+ PREPARING_EACH_ENTITY,
143
217
  PREPARING_FIELDS,
218
+ PREPARING_EACH_ENTITY_FIELD,
144
219
  PREPARING_RELATIONSHIPS,
220
+ PREPARING_EACH_ENTITY_RELATIONSHIP,
221
+ POST_PREPARING_EACH_ENTITY,
222
+
223
+ DEFAULT,
224
+ WRITING,
225
+ WRITING_ENTITIES,
226
+ POST_WRITING,
227
+ POST_WRITING_ENTITIES,
228
+ PRE_CONFLICTS,
229
+ INSTALL,
230
+ END,
231
+ };
232
+
233
+ const BASE_PRIORITY_NAMES = [
234
+ INITIALIZING,
235
+ PROMPTING,
236
+ CONFIGURING,
237
+ COMPOSING,
238
+ LOADING,
239
+ PREPARING,
145
240
  DEFAULT,
146
241
  WRITING,
147
242
  POST_WRITING,
@@ -149,11 +244,120 @@ const PRIORITY_NAMES = [
149
244
  END,
150
245
  ];
151
246
 
247
+ const CUSTOM_PRIORITIES_ENTITIES = [
248
+ {
249
+ priorityName: CONFIGURING_EACH_ENTITY,
250
+ queueName: CONFIGURING_EACH_ENTITY_QUEUE,
251
+ before: LOADING_EACH_ENTITY,
252
+ skip: true,
253
+ },
254
+ {
255
+ priorityName: LOADING_EACH_ENTITY,
256
+ queueName: LOADING_EACH_ENTITY_QUEUE,
257
+ before: PREPARING_EACH_ENTITY,
258
+ skip: true,
259
+ },
260
+ {
261
+ priorityName: PREPARING_EACH_ENTITY,
262
+ queueName: PREPARING_EACH_ENTITY_QUEUE,
263
+ before: PREPARING_FIELDS,
264
+ skip: true,
265
+ },
266
+ {
267
+ priorityName: PREPARING_EACH_ENTITY_FIELD,
268
+ queueName: PREPARING_EACH_ENTITY_FIELD_QUEUE,
269
+ before: PREPARING_RELATIONSHIPS,
270
+ skip: true,
271
+ },
272
+ {
273
+ priorityName: PREPARING_EACH_ENTITY_RELATIONSHIP,
274
+ queueName: PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE,
275
+ before: POST_PREPARING_EACH_ENTITY,
276
+ skip: true,
277
+ },
278
+ {
279
+ priorityName: POST_PREPARING_EACH_ENTITY,
280
+ queueName: POST_PREPARING_EACH_ENTITY_QUEUE,
281
+ before: DEFAULT,
282
+ skip: true,
283
+ },
284
+ {
285
+ priorityName: WRITING_ENTITIES,
286
+ queueName: WRITING_ENTITIES_QUEUE,
287
+ before: POST_WRITING,
288
+ skip: true,
289
+ },
290
+ {
291
+ priorityName: POST_WRITING_ENTITIES,
292
+ queueName: POST_WRITING_ENTITIES_QUEUE,
293
+ before: POST_WRITING,
294
+ skip: true,
295
+ },
296
+ ].reverse();
297
+
298
+ const QUEUES = {
299
+ INITIALIZING_QUEUE: INITIALIZING,
300
+ PROMPTING_QUEUE: PROMPTING,
301
+ CONFIGURING_QUEUE: CONFIGURING,
302
+ COMPOSING_QUEUE,
303
+ LOADING_QUEUE,
304
+ PREPARING_QUEUE,
305
+
306
+ CONFIGURING_EACH_ENTITY_QUEUE,
307
+ LOADING_EACH_ENTITY_QUEUE,
308
+ PREPARING_EACH_ENTITY_QUEUE,
309
+ PREPARING_FIELDS_QUEUE,
310
+ PREPARING_EACH_ENTITY_FIELD_QUEUE,
311
+ PREPARING_RELATIONSHIPS_QUEUE,
312
+ PREPARING_EACH_ENTITY_RELATIONSHIP_QUEUE,
313
+
314
+ DEFAULT_QUEUE: DEFAULT,
315
+ WRITING_QUEUE: WRITING,
316
+ WRITING_ENTITIES_QUEUE,
317
+ POST_WRITING_QUEUE,
318
+ POST_WRITING_ENTITIES_QUEUE,
319
+ PRE_CONFLICTS_QUEUE,
320
+ INSTALL_QUEUE: INSTALL,
321
+ END_QUEUE: END,
322
+ };
323
+
324
+ const ENTITY_PRIORITY_NAMES = [
325
+ INITIALIZING,
326
+ PROMPTING,
327
+ CONFIGURING,
328
+ COMPOSING,
329
+ LOADING,
330
+ PREPARING,
331
+ PREPARING_FIELDS,
332
+ PREPARING_RELATIONSHIPS,
333
+ DEFAULT,
334
+ WRITING,
335
+ POST_WRITING,
336
+ INSTALL,
337
+ END,
338
+ ];
339
+
340
+ const BASE_ENTITY_PRIORITY_NAMES = [
341
+ CONFIGURING_EACH_ENTITY,
342
+ LOADING_EACH_ENTITY,
343
+ PREPARING_EACH_ENTITY,
344
+ PREPARING_EACH_ENTITY_FIELD,
345
+ PREPARING_EACH_ENTITY_RELATIONSHIP,
346
+ POST_PREPARING_EACH_ENTITY,
347
+ WRITING_ENTITIES,
348
+ POST_WRITING_ENTITIES,
349
+ ];
350
+
152
351
  module.exports = {
352
+ PRIORITY_NAMES,
153
353
  PRIORITY_PREFIX,
154
354
  CUSTOM_PRIORITIES,
155
- PRIORITY_NAMES,
355
+ CUSTOM_PRIORITIES_ENTITIES,
356
+ BASE_PRIORITY_NAMES,
357
+ ENTITY_PRIORITY_NAMES,
358
+ BASE_ENTITY_PRIORITY_NAMES,
156
359
  compat,
360
+ QUEUES,
157
361
 
158
362
  INITIALIZING_PRIORITY,
159
363
  PROMPTING_PRIORITY,
@@ -161,11 +365,21 @@ module.exports = {
161
365
  COMPOSING_PRIORITY,
162
366
  LOADING_PRIORITY,
163
367
  PREPARING_PRIORITY,
368
+
369
+ CONFIGURING_EACH_ENTITY_PRIORITY,
370
+ LOADING_EACH_ENTITY_PRIORITY,
371
+ PREPARING_EACH_ENTITY_PRIORITY,
164
372
  PREPARING_FIELDS_PRIORITY,
373
+ PREPARING_EACH_ENTITY_FIELD_PRIORITY,
165
374
  PREPARING_RELATIONSHIPS_PRIORITY,
375
+ PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
376
+ POST_PREPARING_EACH_ENTITY_PRIORITY,
377
+
166
378
  DEFAULT_PRIORITY,
167
379
  WRITING_PRIORITY,
380
+ WRITING_ENTITIES_PRIORITY,
168
381
  POST_WRITING_PRIORITY,
382
+ POST_WRITING_ENTITIES_PRIORITY,
169
383
  PRE_CONFLICTS_PRIORITY,
170
384
  INSTALL_PRIORITY,
171
385
  END_PRIORITY,
@@ -16,4 +16,32 @@
16
16
  * See the License for the specific language governing permissions and
17
17
  * limitations under the License.
18
18
  */
19
- export { default } from './priorities.cjs';
19
+
20
+ export {
21
+ PRIORITY_PREFIX,
22
+ PRIORITY_NAMES,
23
+ BASE_PRIORITY_NAMES,
24
+ ENTITY_PRIORITY_NAMES,
25
+ INITIALIZING_PRIORITY,
26
+ PROMPTING_PRIORITY,
27
+ CONFIGURING_PRIORITY,
28
+ COMPOSING_PRIORITY,
29
+ LOADING_PRIORITY,
30
+ PREPARING_PRIORITY,
31
+ CONFIGURING_EACH_ENTITY_PRIORITY,
32
+ LOADING_EACH_ENTITY_PRIORITY,
33
+ PREPARING_EACH_ENTITY_PRIORITY,
34
+ PREPARING_EACH_ENTITY_FIELD_PRIORITY,
35
+ PREPARING_EACH_ENTITY_RELATIONSHIP_PRIORITY,
36
+ PREPARING_FIELDS_PRIORITY,
37
+ PREPARING_RELATIONSHIPS_PRIORITY,
38
+ POST_PREPARING_EACH_ENTITY_PRIORITY,
39
+ DEFAULT_PRIORITY,
40
+ WRITING_PRIORITY,
41
+ WRITING_ENTITIES_PRIORITY,
42
+ POST_WRITING_PRIORITY,
43
+ POST_WRITING_ENTITIES_PRIORITY,
44
+ PRE_CONFLICTS_PRIORITY,
45
+ INSTALL_PRIORITY,
46
+ END_PRIORITY,
47
+ } from './priorities.cjs';