generator-jhipster 8.7.0 → 8.7.1

package/dist/generators/server/support/update-languages.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Update Languages In MailServiceIT
+ *
+ * @param application
+ */
+export declare const updateLanguagesInMailServiceITTask: (this: import("../../index.js").GeneratorBaseCore, params: import("../../../lib/types/application/tasks.js").PostWritingTaskParam<import("../../base-application/index.js").Entity<import("../../base-application/index.js").Field, never>, import("../../../lib/types/application/application.js").ApplicationType<import("../../base-application/index.js").Entity<import("../../base-application/index.js").Field, never>>>) => void;
+declare const _default: (this: import("../../index.js").GeneratorBaseCore, params: import("../../../lib/types/application/tasks.js").PostWritingTaskParam<import("../../base-application/index.js").Entity<import("../../base-application/index.js").Field, never>, import("../../../lib/types/application/application.js").ApplicationType<import("../../base-application/index.js").Entity<import("../../base-application/index.js").Field, never>>>) => void;
+export default _default;

package/dist/generators/server/support/update-languages.js

@@ -16,12 +16,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { asPostWritingTask } from '../../base-application/support/task-type-inference.js';
 /**
  * Update Languages In MailServiceIT
  *
  * @param application
  */
-export function updateLanguagesInMailServiceITTask({ application, control }) {
+export const updateLanguagesInMailServiceITTask = asPostWritingTask(function updateLanguagesInMailServiceITTask({ application, control }) {
     const { javaPackageTestDir, languagesDefinition } = application;
     const { ignoreNeedlesError: ignoreNonExisting } = control;
     let newContent = 'private static final String[] languages = {\n';
@@ -30,7 +31,7 @@ export function updateLanguagesInMailServiceITTask({ application, control }) {
     });
     newContent += '        // jhipster-needle-i18n-language-constant - JHipster will add/remove languages in this array\n    };';
     this.editFile(`${javaPackageTestDir}/service/MailServiceIT.java`, { ignoreNonExisting }, content => content.replace(/private.*static.*String.*languages.*\{([^}]*jhipster-needle-i18n-language-constant[^}]*)\};/g, newContent));
-}
-export default function updateLanguagesTask(taskParam) {
+});
+export default asPostWritingTask(function updateLanguagesTask(taskParam) {
     updateLanguagesInMailServiceITTask.call(this, taskParam);
-}
+});

package/dist/generators/server/types.d.ts

@@ -0,0 +1,149 @@
+import type { JavaApplication, JavaSourceType } from '../java/types.js';
+import type { GradleSourceType } from '../gradle/types.js';
+import type { MavenSourceType } from '../maven/types.js';
+import type { LiquibaseSourceType } from '../liquibase/types.js';
+import type { SpringCacheSourceType } from '../spring-cache/types.js';
+import type { OptionWithDerivedProperties } from '../base-application/application-options.js';
+import type { GatewayApplication } from '../spring-cloud/generators/gateway/types.js';
+import type { JavaAnnotation } from '../java/support/add-java-annotation.ts';
+import type { ApplicationPropertiesNeedles } from './support/needles.ts';
+
+export type SpringEntity = {
+  /* Generate entity's Entity */
+  entityDomainLayer?: boolean;
+  /* Generate entity's Repository */
+  entityPersistenceLayer?: boolean;
+  /* Generate entity's Rest Api */
+  entityRestLayer?: boolean;
+  entitySpringPreAuthorize?: string;
+  entitySpringReadPreAuthorize?: string;
+  skipJunitTests?: string;
+};
+
+export type SpringBootSourceType = JavaSourceType &
+  GradleSourceType &
+  MavenSourceType &
+  SpringCacheSourceType &
+  LiquibaseSourceType & {
+    addTestSpringFactory?({ key, value }: { key: string; value: string }): void;
+    addLogbackLogEntry?({ file, name, level }: { file: string; name: string; level: string }): void;
+    addLogbackMainLog?({ name, level }: { name: string; level: string }): void;
+    addLogbackTestLog?({ name, level }: { name: string; level: string }): void;
+    addIntegrationTestAnnotation?(annotation: JavaAnnotation): void;
+    addAllowBlockingCallsInside?({ classPath, method }: { classPath: string; method: string }): void;
+    addApplicationPropertiesContent?(content: ApplicationPropertiesNeedles): void;
+    addApplicationPropertiesProperty?({ propertyName, propertyType }: { propertyName: string; propertyType: string }): void;
+  };
+
+type CacheProviderApplication = OptionWithDerivedProperties<
+  'cacheProvider',
+  ['no', 'caffeine', 'ehcache', 'hazelcast', 'infinispan', 'memcached', 'redis']
+>;
+
+type ImperativeApplication = {
+  reactive: false;
+};
+
+type ReactiveApplication = {
+  reactive: true;
+};
+
+export type LiquibaseApplication = {
+  incrementalChangelog: boolean;
+  liquibaseDefaultSchemaName: string;
+};
+
+/*
+Deterministic option causes types to be too complex
+type DatabaseTypeSqlApplication = (
+  | ReactiveApplication
+  | (ImperativeApplication & {
+      enableHibernateCache: boolean;
+    })
+) & {
+  devDatabaseType: string;
+  prodDatabaseType: string;
+  devDatabaseTypeMysql: boolean;
+} & LiquibaseApplication;
+ */
+type DatabaseTypeSqlApplication = {
+  enableHibernateCache: boolean;
+} & {
+  devDatabaseType: string;
+  prodDatabaseType: string;
+  devDatabaseTypeMysql: boolean;
+} & LiquibaseApplication;
+/*
+Deterministic option causes types to be too complex
+type DatabaseTypeApplication = DeterministicOptionWithDerivedProperties<
+  'databaseType',
+  ['sql', 'no', 'cassandra', 'couchbase', 'mongodb', 'neo4j'],
+  [DatabaseTypeSqlApplication]
+>;
+*/
+type DatabaseTypeApplication = DatabaseTypeSqlApplication &
+  OptionWithDerivedProperties<'databaseType', ['sql', 'no', 'cassandra', 'couchbase', 'mongodb', 'neo4j']>;
+
+/*
+Deterministic option causes types to be too complex
+type BuildToolApplication = DeterministicOptionWithDerivedProperties<
+  'buildTool',
+  ['maven', 'gradle'],
+  [
+    Record<string, never>,
+    {
+      enableGradleEnterprise: boolean;
+    },
+  ]
+>;
+*/
+type BuildToolApplication = OptionWithDerivedProperties<'buildTool', ['maven', 'gradle']> & {
+  enableGradleEnterprise: boolean;
+};
+
+type SearchEngine = {
+  searchEngine: string;
+};
+
+/*
+Deterministic option causes types to be too complex
+type ApplicationNature = (ImperativeApplication & CacheProviderApplication) | ReactiveApplication;
+*/
+type ApplicationNature = { reactive: boolean } & CacheProviderApplication;
+
+export type SpringBootApplication = JavaApplication &
+  ApplicationNature &
+  BuildToolApplication &
+  SearchEngine &
+  DatabaseTypeApplication &
+  GatewayApplication & {
+    jhipsterDependenciesVersion: string;
+    springBootDependencies: Record<string, string>;
+    dockerContainers: Record<string, string>;
+
+    addSpringMilestoneRepository: boolean;
+
+    enableSwaggerCodegen: boolean;
+    embeddableLaunchScript: boolean;
+    skipFakeData: boolean;
+    skipCheckLengthOfIdentifier: boolean;
+
+    imperativeOrReactive: string;
+    optionalOrMono: string;
+    optionalOrMonoOfNullable: string;
+    listOrFlux: string;
+    optionalOrMonoClassPath: string;
+    wrapMono: (className: string) => string;
+    listOrFluxClassPath: string;
+
+    generateAuthenticationApi?: boolean;
+    generateInMemoryUserCredentials?: boolean;
+
+    databaseMigration: string;
+    databaseMigrationLiquibase: boolean;
+
+    communicationSpringWebsocket: boolean;
+    requiresDeleteAllUsers: boolean;
+    reactorBlock: string;
+    reactorBlockOptional: string;
+  };

package/dist/generators/spring-boot/cleanup-oauth2.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ */
+declare const _default: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
+export default _default;

package/dist/generators/spring-boot/cleanup-oauth2.js

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { asWritingTask } from '../base-application/support/task-type-inference.js';
+import { asWritingTask } from '../base-application/support/index.js';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.

package/dist/generators/spring-boot/cleanup.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ */
+declare const _default: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>) => void;
+export default _default;

package/dist/generators/spring-boot/cleanup.js

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { JAVA_DOCKER_DIR } from '../generator-constants.js';
-import { asWritingTask } from '../base-application/support/task-type-inference.js';
+import { asWritingTask } from '../base-application/support/index.js';
 import cleanupOauth2 from './cleanup-oauth2.js';
 /**
  * Removes server files that where generated in previous JHipster versions and therefore

package/dist/generators/spring-boot/command.d.ts

@@ -0,0 +1,165 @@
+declare const command: {
+    readonly options: {
+        readonly fakeKeytool: {
+            readonly description: "Add a fake certificate store file for test purposes";
+            readonly type: BooleanConstructor;
+            readonly env: "FAKE_KEYTOOL";
+            readonly scope: "generator";
+            readonly hide: true;
+        };
+    };
+    readonly configs: {
+        readonly reactive: {
+            readonly cli: {
+                readonly description: "Generate a reactive backend";
+                readonly type: BooleanConstructor;
+            };
+            readonly prompt: (gen: any) => {
+                when: () => boolean;
+                type: "confirm";
+                message: string;
+            };
+            readonly scope: "storage";
+        };
+        readonly serverPort: {
+            readonly prompt: (gen: any) => {
+                when: () => boolean;
+                type: "input";
+                validate: (input: any) => true | "This is not a valid port number.";
+                message: string;
+                default: () => any;
+            };
+            readonly configure: (gen: any) => void;
+            readonly scope: "storage";
+        };
+        readonly serviceDiscoveryType: {
+            readonly cli: {
+                readonly description: "Service discovery type";
+                readonly type: StringConstructor;
+            };
+            readonly prompt: (gen: any) => {
+                when: () => boolean;
+                type: "list";
+                message: string;
+                default: string;
+            };
+            readonly choices: readonly [{
+                readonly value: "consul";
+                readonly name: "Consul (recommended)";
+            }, {
+                readonly value: "eureka";
+                readonly name: "JHipster Registry (legacy, uses Eureka, provides Spring Cloud Config support)";
+            }, {
+                readonly value: "no";
+                readonly name: "No service discovery";
+            }];
+            readonly scope: "storage";
+        };
+        readonly authenticationType: {
+            readonly cli: {
+                readonly name: "auth";
+                readonly description: "Provide authentication type for the application when skipping server side generation";
+                readonly type: StringConstructor;
+            };
+            readonly prompt: (gen: any, config: import("../../lib/command/types.js").ConfigSpec<any>) => {
+                type: "list";
+                message: string;
+                choices: () => any;
+                default: () => any;
+            };
+            readonly choices: readonly [{
+                readonly value: "jwt";
+                readonly name: "JWT authentication (stateless, with a token)";
+            }, {
+                readonly value: "oauth2";
+                readonly name: "OAuth 2.0 / OIDC Authentication (stateful, works with Keycloak and Okta)";
+            }, {
+                readonly value: "session";
+                readonly name: "HTTP Session Authentication (stateful, default Spring Security mechanism)";
+            }];
+            readonly configure: (gen: any) => void;
+            readonly scope: "storage";
+        };
+        readonly feignClient: {
+            readonly description: "Generate a feign client";
+            readonly cli: {
+                readonly type: BooleanConstructor;
+            };
+            readonly prompt: (gen: any) => {
+                type: "confirm";
+                message: string;
+                when: ({ reactive }: any) => boolean;
+            };
+            readonly jdl: {
+                readonly type: "boolean";
+                readonly tokenType: "BOOLEAN";
+            };
+            readonly default: false;
+            readonly scope: "storage";
+        };
+        readonly syncUserWithIdp: {
+            readonly description: "Allow relationships with User for oauth2 applications";
+            readonly cli: {
+                readonly type: BooleanConstructor;
+            };
+            readonly prompt: (gen: any) => {
+                type: "confirm";
+                message: string;
+                when: ({ authenticationType }: any) => boolean;
+            };
+            readonly jdl: {
+                readonly type: "boolean";
+                readonly tokenType: "BOOLEAN";
+            };
+            readonly configure: (gen: any) => void;
+            readonly scope: "storage";
+        };
+        readonly defaultPackaging: {
+            readonly description: "Default packaging for the application";
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly hide: true;
+            };
+            readonly choices: readonly ["jar", "war"];
+            readonly default: "jar";
+            readonly scope: "storage";
+            readonly configure: (gen: any) => void;
+        };
+        readonly databaseType: {
+            readonly cli: {
+                readonly type: StringConstructor;
+                readonly hide: true;
+            };
+            readonly choices: readonly ["sql", "mongodb", "couchbase", "cassandra", "neo4j", "no"];
+            readonly scope: "storage";
+        };
+        readonly messageBroker: {
+            readonly description: "message broker";
+            readonly cli: {
+                readonly type: StringConstructor;
+            };
+            readonly jdl: {
+                readonly type: "string";
+                readonly tokenType: "NAME";
+                readonly tokenValuePattern: RegExp;
+            };
+            readonly choices: readonly ["kafka", "pulsar", "no"];
+            readonly scope: "storage";
+        };
+        readonly databaseMigration: {
+            readonly description: "Database migration";
+            readonly cli: {
+                readonly type: StringConstructor;
+            };
+            readonly jdl: {
+                readonly type: "string";
+                readonly tokenType: "NAME";
+                readonly tokenValuePattern: RegExp;
+            };
+            readonly choices: readonly ["liquibase"];
+            readonly scope: "storage";
+        };
+    };
+    readonly import: readonly ["java", "liquibase", "spring-data-relational", "jhipster:spring-cloud:gateway"];
+};
+export default command;

package/dist/generators/spring-boot/command.js

@@ -19,9 +19,10 @@
 import chalk from 'chalk';
 import { GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL } from '../generator-list.js';
 import { createBase64Secret, createSecret } from '../base/support/secret.js';
-import { applicationTypes, authenticationTypes } from '../../jdl/index.js';
+import { applicationTypes, authenticationTypes } from '../../lib/jhipster/index.js';
 const { OAUTH2, SESSION, JWT } = authenticationTypes;
 const { GATEWAY, MICROSERVICE } = applicationTypes;
+const ALPHANUMERIC_PATTERN = /^[A-Za-z][A-Za-z0-9]*$/;
 const command = {
     options: {
         fakeKeytool: {
@@ -43,6 +44,7 @@ const command = {
                 type: 'confirm',
                 message: 'Do you want to make it reactive with Spring WebFlux?',
             }),
+            scope: 'storage',
         },
         serverPort: {
             prompt: gen => ({
@@ -57,6 +59,7 @@ const command = {
                     gen.jhipsterConfig.serverPort = 8080 + gen.jhipsterConfig.applicationIndex;
                 }
             },
+            scope: 'storage',
         },
         serviceDiscoveryType: {
             cli: {
@@ -74,6 +77,7 @@ const command = {
                 { value: 'eureka', name: 'JHipster Registry (legacy, uses Eureka, provides Spring Cloud Config support)' },
                 { value: 'no', name: 'No service discovery' },
             ],
+            scope: 'storage',
         },
         authenticationType: {
             cli: {
@@ -107,6 +111,7 @@ const command = {
                     gen.jhipsterConfig.jwtSecretKey = createBase64Secret(64, gen.options.reproducibleTests);
                 }
             },
+            scope: 'storage',
         },
         feignClient: {
             description: 'Generate a feign client',
@@ -119,7 +124,12 @@ const command = {
                 when: ({ reactive }) => [MICROSERVICE].includes(gen.jhipsterConfigWithDefaults.applicationType) &&
                     (reactive ?? gen.jhipsterConfigWithDefaults.reactive) === false,
             }),
+            jdl: {
+                type: 'boolean',
+                tokenType: 'BOOLEAN',
+            },
             default: false,
+            scope: 'storage',
         },
         syncUserWithIdp: {
             description: 'Allow relationships with User for oauth2 applications',
@@ -131,6 +141,10 @@ const command = {
                 message: 'Do you want to allow relationships with User entity?',
                 when: ({ authenticationType }) => (authenticationType ?? gen.jhipsterConfigWithDefaults.authenticationType) === 'oauth2',
             }),
+            jdl: {
+                type: 'boolean',
+                tokenType: 'BOOLEAN',
+            },
             configure: gen => {
                 if (gen.jhipsterConfig.syncUserWithIdp === undefined && gen.jhipsterConfigWithDefaults.authenticationType === 'oauth2') {
                     if (gen.isJhipsterVersionLessThan('8.1.1')) {
@@ -141,6 +155,7 @@ const command = {
                     throw new Error('syncUserWithIdp is only supported with authenticationType oauth2');
                 }
             },
+            scope: 'storage',
         },
         defaultPackaging: {
             description: 'Default packaging for the application',
@@ -157,7 +172,41 @@ const command = {
                 }
             },
         },
+        databaseType: {
+            cli: {
+                type: String,
+                hide: true,
+            },
+            choices: ['sql', 'mongodb', 'couchbase', 'cassandra', 'neo4j', 'no'],
+            scope: 'storage',
+        },
+        messageBroker: {
+            description: 'message broker',
+            cli: {
+                type: String,
+            },
+            jdl: {
+                type: 'string',
+                tokenType: 'NAME',
+                tokenValuePattern: ALPHANUMERIC_PATTERN,
+            },
+            choices: ['kafka', 'pulsar', 'no'],
+            scope: 'storage',
+        },
+        databaseMigration: {
+            description: 'Database migration',
+            cli: {
+                type: String,
+            },
+            jdl: {
+                type: 'string',
+                tokenType: 'NAME',
+                tokenValuePattern: ALPHANUMERIC_PATTERN,
+            },
+            choices: ['liquibase'],
+            scope: 'storage',
+        },
     },
-    import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL],
+    import: [GENERATOR_JAVA, GENERATOR_LIQUIBASE, GENERATOR_SPRING_DATA_RELATIONAL, 'jhipster:spring-cloud:gateway'],
 };
 export default command;

package/dist/generators/spring-boot/entity-cleanup.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { ApplicationType } from '../../lib/types/application/application.js';
+import type { Entity } from '../../lib/types/application/entity.js';
+import type CoreGenerator from '../base-core/generator.js';
+/**
+ * Removes server files that where generated in previous JHipster versions and therefore
+ * need to be removed.
+ *
+ * @param {import('../base/index.js')} this - reference to generator
+ * @param {Object} application
+ * @param {Object} entity
+ */
+export declare function cleanupOldFiles(this: CoreGenerator, { application: { packageFolder, srcMainJava, srcTestJava, searchEngineElasticsearch }, entity: { entityClass, entityAbsoluteFolder }, }: {
+    application: ApplicationType<Entity>;
+    entity: Entity;
+}): void;

package/dist/generators/spring-boot/entity-cleanup.js

@@ -1,21 +1,3 @@
-/**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * Removes server files that where generated in previous JHipster versions and therefore
  * need to be removed.