generator-jhipster 8.2.0 → 8.3.0

package/dist/types/generators/base-core/generator.d.ts

@@ -41,6 +41,13 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
      */
     jhipsterTemplatesFolders: string[];
     blueprintStorage?: Storage;
+    /** Allow to use a specific definition at current command operations */
+    generatorCommand?: JHipsterCommandDefinition;
+    /**
+     * @experimental
+     * Additional commands to be considered
+     */
+    generatorsToCompose: string[];
     private _jhipsterGenerator?;
     private _needleApi?;
     env: Environment;
@@ -87,8 +94,32 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
      * Override yeoman-generator method that gets methods to be queued, filtering the result.
      */
     getTaskNames(): string[];
+    /**
+     * Get the current Command Definition for the generator.
+     * `generatorCommand` takes precedence.
+     */
+    getCurrentJHipsterCommand(): Promise<JHipsterCommandDefinition>;
+    /**
+     * Parse command definition arguments, options and configs.
+     * Blueprints with command override takes precedence.
+     */
     parseCurrentJHipsterCommand(): Promise<void>;
+    /**
+     * Prompts for command definition configs.
+     * Blueprints with command override takes precedence.
+     */
     promptCurrentJHipsterCommand(): Promise<any>;
+    /**
+     * Load the current JHipster command storage configuration into the context.
+     * Blueprints with command override takes precedence.
+     */
+    loadCurrentJHipsterCommandConfig(context: any): Promise<void>;
+    /**
+     * @experimental
+     * Compose the current JHipster command compose.
+     * Blueprints commands compose without generators will be composed.
+     */
+    composeCurrentJHipsterCommand(): Promise<void>;
     parseJHipsterCommand(commandDef: JHipsterCommandDefinition): void;
     parseJHipsterOptions(options: JHipsterOptions | undefined, configs?: JHipsterConfigs | boolean, common?: boolean): void;
     parseJHipsterArguments(jhipsterArguments?: JHipsterArguments): void;
@@ -100,6 +131,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
         default?: any;
         filter?: any;
         transformer?: any;
+        validate?: any;
         name: string;
         choices: import("../base/api.js").JHispterChoices | undefined;
     }[];
@@ -183,7 +215,7 @@ export default class CoreGenerator extends YeomanGenerator<JHipsterGeneratorOpti
     /**
      * Shallow clone or convert dependencies to placeholder if needed.
      */
-    prepareDependencies(map: Record<string, string>, valuePlaceholder?: (value: string) => string): Record<string, string>;
+    prepareDependencies(map: Record<string, string>, valuePlaceholder?: 'java' | 'docker' | ((value: string) => string)): Record<string, string>;
     loadNodeDependencies(destination: Record<string, string>, source: Record<string, string>): void;
     /**
      * Load Java dependencies from a gradle catalog file.

package/dist/types/generators/bootstrap/internal/transform-utils.d.ts

@@ -0,0 +1 @@
+export function addLineNumbers(input: any): any;

package/dist/types/generators/bootstrap/support/java-unused-imports-transform.d.ts

@@ -1,4 +1,4 @@
-import CoreGenerator from '../../base-core/index.js';
+import type CoreGenerator from '../../base-core/index.js';
 export declare const createRemoveUnusedImportsTransform: (this: CoreGenerator, options?: {
     ignoreErrors?: boolean;
 }) => import("p-transform").DuplexWithDebug;

package/dist/types/generators/bootstrap-application-base/support/export-jdl-transform.d.ts

@@ -3,6 +3,6 @@ import { Duplex } from 'stream';
 export declare const exportJDLTransform: ({ destinationPath, jdlStorePath, throwOnMissingConfig, keepEntitiesConfig, }: {
     destinationPath: string;
     jdlStorePath: string;
-    throwOnMissingConfig?: boolean | undefined;
-    keepEntitiesConfig?: boolean | undefined;
+    throwOnMissingConfig?: boolean;
+    keepEntitiesConfig?: boolean;
 }) => Duplex;

package/dist/types/generators/docker/utils.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Extract version properties from pom content
+ * @param {string} pomContent
+ * @returns {Record<string, string>}
+ */
+export function getDockerfileContainers(dockerfileContent: any): Record<string, string>;
+export function dockerPlaceholderGenerator(value: any): string;

package/dist/types/generators/generator-constants.d.ts

@@ -1,27 +1,9 @@
-/**
- * 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.
- */
 export const BLUEPRINT_API_VERSION: "jhipster-8";
-export const JHIPSTER_DEPENDENCIES_VERSION: "8.2.0";
+export const JHIPSTER_DEPENDENCIES_VERSION: "8.3.0";
 export const JAVA_VERSION: "17";
 export const JAVA_COMPATIBLE_VERSIONS: string[];
 export const ADD_SPRING_MILESTONE_REPOSITORY: false;
-export const NODE_VERSION: "20.11.1";
+export const NODE_VERSION: string;
 export const OPENAPI_GENERATOR_CLI_VERSION: "2.13.1";
 export const ELASTICSEARCH_TAG: "8.10.4";
 export const ELASTICSEARCH_IMAGE: "docker.elastic.co/elasticsearch/elasticsearch";

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

@@ -1,12 +1,14 @@
 import { RequireOneOrNone } from 'type-fest';
 
+export type GradleComment = { comment?: string };
+
 export type GradleScript = { script: string };
 
 export type GradleDependency = { groupId: string; artifactId: string; version?: string; scope: string; classifier?: string };
 
 export type GradlePlugin = { id: string; version?: string };
 
-export type GradleProperty = { property: string; value: string };
+export type GradleProperty = { property: string; value?: string };
 
 export type GradleRepository = { url: string; username?: string; password?: string };
 
@@ -26,22 +28,34 @@ export type GradleTomlPlugin = { pluginName: string; addToBuild?: boolean } & (
   | ({ id: string } & GradleTomlAnyItemVersion)
 );
 
-export type GradleNeedleOptions = { gradleFile?: string };
+export type GradleFileNeedleOptions = { gradleFile?: string };
+export type GradleCatalogNeedleOptions = { gradleVersionCatalogFile?: string };
+
+export type GradleNeedleOptions = GradleFileNeedleOptions & GradleCatalogNeedleOptions;
 
 export type GradleSourceType = {
   applyFromGradle?(script: GradleScript): void;
-  addGradleDependency?(dependency: GradleDependency, options?: GradleNeedleOptions): void;
-  addGradleDependencies?(dependency: GradleDependency[], options?: GradleNeedleOptions): void;
+  addGradleDependency?(dependency: GradleDependency, options?: GradleFileNeedleOptions): void;
+  addGradleDependencies?(dependency: GradleDependency[], options?: GradleFileNeedleOptions): void;
   addGradlePlugin?(plugin: GradlePlugin): void;
   addGradlePluginManagement?(pluginManagement: GradlePlugin): void;
-  addGradleProperty?(property: GradleProperty): void;
+  addGradleProperty?(property: GradleProperty & GradleComment): void;
   addGradleMavenRepository?(repository: GradleRepository): void;
   addGradleBuildSrcDependency?(dependency: GradleDependency): void;
-  addGradleDependencyCatalogVersion?(catalogVersion: GradleTomlVersion): void;
-  addGradleDependencyCatalogVersions?(catalogVersion: GradleTomlVersion[]): void;
+
+  addGradleDependencyCatalogVersion?(catalogVersion: GradleTomlVersion, options?: GradleCatalogNeedleOptions): void;
+  addGradleDependencyCatalogVersions?(catalogVersion: GradleTomlVersion[], options?: GradleCatalogNeedleOptions): void;
   addGradleDependencyCatalogLibrary?(catalogVersion: GradleLibrary, options?: GradleNeedleOptions): void;
   addGradleDependencyCatalogLibraries?(catalogVersion: GradleLibrary[], options?: GradleNeedleOptions): void;
   addGradleDependencyCatalogPlugin?(catalogVersion: GradleTomlPlugin): void;
   addGradleDependencyCatalogPlugins?(catalogVersion: GradleTomlPlugin[]): void;
+
   addGradleBuildSrcDependencyCatalogVersion?(catalogVersion: GradleTomlVersion): void;
+  addGradleBuildSrcDependencyCatalogVersions?(catalogVersion: GradleTomlVersion[]): void;
+  addGradleBuildSrcDependencyCatalogLibraries?(catalogVersion: GradleLibrary[]): void;
+};
+
+export type GradleApplication = {
+  gradleVersion?: string;
+  gradleBuildSrc?: string;
 };

package/dist/types/generators/java/support/index.d.ts

@@ -25,5 +25,6 @@ export { default as generatedAnnotationTransform } from './generated-annotation-
 export * from './java-formatting.js';
 export * from './key-store.js';
 export { default as packageInfoTransform } from './package-info-transform.js';
+export * from './package-info-transform.js';
 export * from './reserved-keywords.js';
 export * from './util.js';

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

@@ -1,6 +1,6 @@
 import { RequireOneOrNone } from 'type-fest';
 import { BaseApplication } from '../base-application/types.js';
-import { GradleNeedleOptions } from '../gradle/types.js';
+import { GradleApplication, GradleNeedleOptions } from '../gradle/types.js';
 
 export type JavaDependencyVersion = {
   name: string;
@@ -18,44 +18,59 @@ export type JavaArtifact = {
   classifier?: string;
 } & JavaArtifactType;
 
-export type JavaArtifactVersion = RequireOneOrNone<{ version: string; versionRef: string }, 'version' | 'versionRef'>;
+export type JavaArtifactVersion = RequireOneOrNone<{ version?: string; versionRef?: string }, 'version' | 'versionRef'>;
 
 export type JavaDependency = JavaArtifact & JavaArtifactVersion;
 
 export type JavaDefinition = {
-  versions: JavaDependencyVersion[];
-  dependencies: JavaDependency[];
+  versions?: JavaDependencyVersion[];
+  dependencies?: JavaDependency[];
 };
 
 export type JavaNeedleOptions = GradleNeedleOptions;
 
-export type JavaApplication = BaseApplication & {
-  javaVersion: string;
+export type JavaApplication = BaseApplication &
+  GradleApplication & {
+    javaVersion: string;
 
-  packageName: string;
-  packageFolder: string;
+    packageName: string;
+    packageFolder: string;
+    entityPackages: string[];
 
-  srcMainJava: string;
-  srcMainResources: string;
-  srcMainWebapp: string;
-  srcTestJava: string;
-  srcTestResources: string;
-  srcTestJavascript: string;
+    srcMainJava: string;
+    srcMainResources: string;
+    srcMainWebapp: string;
+    srcTestJava: string;
+    srcTestResources: string;
+    srcTestJavascript: string;
 
-  javaPackageSrcDir: string;
-  javaPackageTestDir: string;
+    javaPackageSrcDir: string;
+    javaPackageTestDir: string;
 
-  temporaryDir: string;
+    temporaryDir: string;
 
-  javaDependencies: Record<string, string>;
-  packageInfoJavadocs: { packageName: string; documentation: string }[];
+    /** Java dependency versions */
+    javaDependencies: Record<string, string>;
+    /** Known properties that can be used */
+    javaProperties: Record<string, string | null>;
+    /** Known managed properties that can be used */
+    javaManagedProperties: Record<string, string | null>;
+    /** Pre-defined package JavaDocs */
+    packageInfoJavadocs: { packageName: string; documentation: string }[];
 
-  prettierJava: boolean;
+    prettierJava: boolean;
 
-  imperativeOrReactive: string;
-};
+    imperativeOrReactive: string;
+  };
 
 export type JavaSourceType = {
+  /**
+   * Add a JavaDefinition to the application.
+   * A version requires a valid version otherwise it will be ignored.
+   * A dependency with versionRef requires a valid referenced version at `versions` otherwise it will be ignored.
+   */
   addJavaDefinition?(definition: JavaDefinition, options?: JavaNeedleOptions): void;
   addJavaDependencies?(dependency: JavaDependency[], options?: JavaNeedleOptions): void;
+  hasJavaProperty?(propertyName: string): boolean;
+  hasJavaManagedProperty?(propertyName: string): boolean;
 };

package/dist/types/generators/languages/support/translate.d.ts

@@ -16,13 +16,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export declare const escapeHtmlTranslationValue: (translation: string) => string;
+export declare const escapeTsTranslationValue: (translation: string) => string;
 export type TranslationReplaceOptions = {
     keyPattern?: string;
     interpolatePattern?: string;
+    /** Wrap the replacement inside wrapTranslation chars */
     wrapTranslation?: string | string[];
+    /** Escape specific chars for html */
     escapeHtml?: boolean;
+    /** Apply JSON.stringify to the replacement */
     stringify?: boolean;
 };
 export declare const replaceTranslationKeysWithText: (getWebappTranslation: any, body: string, regexp: string, { keyPattern, interpolatePattern, wrapTranslation, escapeHtml, stringify }?: TranslationReplaceOptions) => string;
 export declare const createJhiTransformTranslateReplacer: (getWebappTranslation: any, translateOptions?: TranslationReplaceOptions) => (body: string) => string;
 export declare const createJhiTransformTranslateStringifyReplacer: (getWebappTranslation: any) => (body: string) => string;
+export type JHITranslateConverterOptions = {
+    filePath: string;
+    /** Translation type */
+    type: string;
+    /** Translation key */
+    key: string;
+    /** Translation interpolation data */
+    interpolate: string;
+    /** Parse translation interpolation data */
+    parsedInterpolate: Record<string, string> | undefined;
+    /** Closing tag before the matched string */
+    prefix: string;
+    /** Opening tag after the matched string */
+    suffix: string;
+};
+export type JHITranslateConverter = (opts: JHITranslateConverterOptions) => string;
+export declare const replaceTranslateContents: (body: string, filePath: string, regexp: string, converter: JHITranslateConverter) => string;
+export type JHITranslateReplacerOptions = {
+    /** Allows a before part to be included in replacement */
+    prefixPattern?: string;
+    /** Allows an after part to be included in replacement */
+    suffixPattern?: string;
+};
+export declare const createJhiTranslateReplacer: (converter: JHITranslateConverter, { prefixPattern, suffixPattern }?: JHITranslateReplacerOptions) => (body: string, filePath: string) => string;

package/dist/types/generators/maven/support/dependabot-maven.d.ts

@@ -3,8 +3,24 @@
  * @param pomContent
  */
 export declare function getPomProperties(pomContent: string): Record<string, string>;
+export type MavenPom = {
+    project: {
+        artifactId: string;
+        version: string;
+        properties?: Record<string, string>;
+    };
+};
+export type MavenPomAndVersions = {
+    pomContent: MavenPom;
+    versions: Record<string, string>;
+};
+/**
+ * Extract version properties from pom content
+ * @param fileContent
+ */
+export declare function parseMavenPom(fileContent: string): MavenPom;
 /**
  * Extract version properties from pom content
  * @param pomContent
  */
-export declare function getPomVersionProperties(pomContent: string): Record<string, string>;
+export declare function getPomVersionProperties(pomContent: string | MavenPom): Record<string, string>;

package/dist/types/generators/project-name/support/name-resolver.d.ts

@@ -1,7 +1,7 @@
 export declare const validateJavaApplicationName: (name: string) => true | "Your base name cannot contain special characters or a blank space" | "Your base name cannot contain underscores as this does not meet the URI spec" | "Your base name cannot be named 'application' as this is a reserved name for Spring Boot";
 export declare const validateNpmProjectName: (name: string) => true | "Your base name cannot contain special characters or a blank space";
 export declare const validateProjectName: (name: string, { javaApplication }?: {
-    javaApplication?: boolean | undefined;
+    javaApplication?: boolean;
 }) => true | "Your base name cannot contain special characters or a blank space" | "Your base name cannot contain underscores as this does not meet the URI spec" | "Your base name cannot be named 'application' as this is a reserved name for Spring Boot";
 declare const getDefaultName: (generator: {
     reproducible?: boolean;

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

@@ -109,4 +109,6 @@ export type SpringBootApplication = JavaApplication &
 
     databaseMigration: string;
     databaseMigrationLiquibase: boolean;
+
+    communicationSpringWebsocket: boolean;
   };

package/dist/types/jdl/converters/jdl-to-json/jdl-to-json-field-converter.d.ts

@@ -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.
- */
 import JDLObject from '../../models/jdl-object.js';
 import { Field } from '../types.js';
 declare const _default: {

package/dist/types/testing/helpers.d.ts

@@ -9,6 +9,10 @@ type JHipsterRunResult<GeneratorType extends YeomanGenerator = YeomanGenerator>
      * First argument of mocked source calls.
      */
     sourceCallsArg: Record<string, unknown[]>;
+    /**
+     * Composed generators that were mocked.
+     */
+    composedMockedGenerators: string[];
 };
 declare const runResult: JHipsterRunResult<YeomanGenerator>;
 export { runResult, runResult as result };
@@ -50,6 +54,8 @@ declare class JHipsterRunContext extends RunContext<GeneratorTestType> {
     withMockedSource(): this;
     withControl(sharedControl: Record<string, any>): this;
     withSharedApplication(sharedApplication: Record<string, any>): this;
+    withMockedJHipsterGenerators(exceptList?: string[]): this;
+    withGradleBuildTool(): this;
     private withSharedData;
     run(): Promise<RunResult<GeneratorTestType>>;
 }

package/dist/types/testing/support/matrix-utils.d.ts

@@ -8,5 +8,5 @@ export declare const extendFilteredMatrix: (matrix: any, filter: any, extendedCo
     [k: string]: unknown;
 };
 export declare const buildSamplesFromMatrix: (samples: Record<string, Record<string, unknown>>, { commonConfig }?: {
-    commonConfig?: Record<string, unknown> | undefined;
+    commonConfig?: Record<string, unknown>;
 }) => Record<string, Record<string, unknown>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "8.2.0",
+  "version": "8.3.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -86,7 +86,9 @@
     "!**/*.spec.?(c|m)js"
   ],
   "scripts": {
+    "prebuild": "npm run clean",
     "build": "npm run compile && npm run copy-files && npm run compile-types && npm run copy-types",
+    "postbuild": "node bin/fix-bin.cjs",
     "clean": "rimraf dist",
     "compile": "tsc",
     "compile-types": "tsc -p tsconfig.types.json",
@@ -107,16 +109,15 @@
     "pretest": "npm run lint",
     "test": "npm run mocha-test test generators cli",
     "update-snapshot": "esmocha --no-insight --no-parallel --update-snapshot --",
-    "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only",
-    "watch": "concurrently \"tsc --watch\" \"node ./watch.mjs\""
+    "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only"
   },
   "dependencies": {
     "@faker-js/faker": "8.4.1",
     "@iarna/toml": "3.0.0",
     "@types/ejs": "3.1.5",
     "@types/lodash": "4.17.0",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
-    "@typescript-eslint/parser": "7.3.1",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
     "@yeoman/adapter": "1.4.0",
     "@yeoman/conflicter": "2.0.0",
     "@yeoman/namespace": "1.0.0",
@@ -132,13 +133,12 @@
     "dockerfile-ast": "0.6.1",
     "dot-properties": "1.0.1",
     "ejs": "3.1.9",
-    "escape-string-regexp": "5.0.0",
     "eslint": "8.57.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-unused-imports": "3.1.0",
     "execa": "8.0.1",
     "fast-xml-parser": "4.3.6",
-    "glob": "10.3.10",
+    "glob": "10.3.12",
     "insight": "0.11.1",
     "isbinaryfile": "5.0.2",
     "java-lint": "0.1.1",
@@ -147,26 +147,24 @@
     "lodash-es": "4.17.21",
     "mem-fs": "4.1.0",
     "mem-fs-editor": "11.0.0",
-    "minimatch": "9.0.3",
+    "minimatch": "9.0.4",
     "normalize-path": "3.0.0",
     "os-locale": "6.0.2",
-    "p-queue": "8.0.1",
     "p-transform": "4.1.5",
     "parse-gitignore": "2.0.0",
     "piscina": "4.4.0",
     "pluralize": "8.0.0",
     "prettier": "3.2.5",
     "prettier-plugin-java": "2.6.0",
-    "prettier-plugin-packagejson": "2.4.12",
+    "prettier-plugin-packagejson": "2.4.14",
     "prettier-plugin-properties": "0.3.0",
-    "progress": "2.0.3",
     "randexp": "0.5.3",
-    "run-async": "3.0.0",
     "semver": "7.6.0",
-    "simple-git": "3.23.0",
-    "type-fest": "4.13.0",
-    "uuid": "9.0.1",
-    "winston": "3.12.0",
+    "simple-git": "3.24.0",
+    "sort-keys": "5.0.0",
+    "type-fest": "4.15.0",
+    "typescript": "5.4.4",
+    "winston": "3.13.0",
     "yaml": "2.4.1",
     "yeoman-environment": "4.4.0",
     "yeoman-generator": "7.1.1"
@@ -175,14 +173,9 @@
     "@actions/core": "1.10.1",
     "@node-loaders/esbuildx": "1.4.0",
     "@types/chai": "4.3.11",
-    "@types/glob": "npm:noist@1.0.0",
-    "@types/minimatch": "npm:noist@1.0.0",
-    "@types/mocha": "10.0.6",
     "@types/node": "20.11.25",
     "@types/sinon-chai": "3.2.12",
     "chai": "4.4.1",
-    "chokidar": "3.6.0",
-    "concurrently": "8.2.2",
     "cpy-cli": "5.0.0",
     "ejs-lint": "2.0.0",
     "eslint-config-airbnb-base": "15.0.0",
@@ -191,19 +184,15 @@
     "eslint-plugin-mocha": "10.4.1",
     "eslint-plugin-prettier": "5.1.3",
     "esmocha": "1.2.0",
-    "fs-extra": "11.2.0",
     "jest-extended": "4.0.2",
     "jsdoc": "4.0.2",
-    "octokit": "3.1.2",
+    "octokit": "3.2.0",
     "open-cli": "8.0.0",
     "prettier2": "npm:prettier@2.8.8",
-    "quibble": "0.9.1",
+    "quibble": "0.9.2",
     "rimraf": "5.0.5",
     "sinon": "17.0.1",
     "sinon-chai": "3.7.0",
-    "sort-keys": "5.0.0",
-    "typescript": "5.4.2",
-    "yeoman-assert": "3.1.1",
     "yeoman-test": "8.2.0"
   },
   "peerDependencies": {