generator-jhipster 8.4.0 → 8.5.0

package/dist/types/jdl/models/jdl-object.d.ts

@@ -21,34 +21,38 @@ import JDLRelationships from './jdl-relationships.js';
 import JDLOptions from './jdl-options.js';
 import JDLEntity from './jdl-entity.js';
 import JDLRelationship from './jdl-relationship.js';
+import AbstractJDLOption from './abstract-jdl-option.js';
+import JDLEnum from './jdl-enum.js';
+import JDLDeployment from './jdl-deployment.js';
+import JDLApplication from './jdl-application.js';
 /**
  * The JDL object class, containing applications, entities etc.
  */
 export default class JDLObject {
-    applications: Record<string, any>;
-    deployments: Record<string, any>;
+    applications: Record<string, JDLApplication>;
+    deployments: Record<string, JDLDeployment>;
     entities: Record<string, JDLEntity>;
     enums: JDLEnums;
     relationships: JDLRelationships;
     options: JDLOptions;
     constructor();
-    getOptions(): any[];
+    getOptions(): AbstractJDLOption[];
     /**
      * Adds or replaces an application.
      * @param application the application.
      */
-    addApplication(application: any): void;
+    addApplication(application: JDLApplication): void;
     getApplicationQuantity(): number;
-    getApplication(applicationName: any): any;
-    getApplications(): any[];
-    forEachApplication(passedFunction: any): void;
+    getApplication(applicationName: string): JDLApplication | undefined;
+    getApplications(): JDLApplication[];
+    forEachApplication(passedFunction: (app: JDLApplication) => void | undefined | null): void;
     /**
      * Adds or replaces a deployment.
      * @param deployment the deployment.
      */
-    addDeployment(deployment: any): void;
+    addDeployment(deployment: JDLDeployment): void;
     getDeploymentQuantity(): number;
-    forEachDeployment(passedFunction: any): void;
+    forEachDeployment(passedFunction: (deployment: JDLDeployment, index: number, array: string[]) => void): void;
     /**
      * Adds or replaces an entity.
      * @param entity the entity to add.
@@ -63,20 +67,20 @@ export default class JDLObject {
      * Adds or replaces an enum.
      * @param enumToAdd the enum to add.
      */
-    addEnum(enumToAdd: any): void;
-    hasEnum(enumName: any): boolean;
-    getEnum(enumName: any): any;
+    addEnum(enumToAdd: JDLEnum): void;
+    hasEnum(enumName: string): boolean;
+    getEnum(enumName: string): JDLEnum | undefined;
     getEnumQuantity(): number;
-    forEachEnum(passedFunction: any): void;
-    addRelationship(relationship: any): void;
+    forEachEnum(passedFunction: (jdlEnum: JDLEnum) => void): void;
+    addRelationship(relationship: JDLRelationship): void;
     getRelationshipQuantity(applicationName?: string): number;
-    forEachRelationship(passedFunction?: (relationship: JDLRelationship) => void): void;
+    forEachRelationship(passedFunction: (relationship: JDLRelationship) => void): void;
     getRelationships(): JDLRelationship[];
-    addOption(option: any): void;
-    getOptionsForName(optionName: any): any[];
+    addOption(option: AbstractJDLOption): void;
+    getOptionsForName(optionName: string): any[];
     forEachOption(passedFunction: (option: any) => void): void;
-    hasOption(optionName: any): boolean;
-    isEntityInMicroservice(entityName: any): boolean;
+    hasOption(optionName: string): boolean;
+    isEntityInMicroservice(entityName: string): boolean;
     getOptionQuantity(): number;
     toString(): string;
 }

package/dist/types/jdl/models/jdl-options.d.ts

@@ -1,30 +1,13 @@
-/**
- * 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 AbstractJDLOption from './abstract-jdl-option.js';
 export default class JDLOptions {
-    options: Record<any, any>;
+    options: Record<string, AbstractJDLOption>;
     optionSize: number;
     constructor();
-    addOption(option: any): void;
-    getOptions(): any[];
-    getOptionsForName(optionName: string): any[];
-    has(optionName: string): boolean;
+    addOption(option: AbstractJDLOption): void;
+    getOptions(): AbstractJDLOption[];
+    getOptionsForName(optionName: string): AbstractJDLOption[];
+    has(optionName?: string): boolean;
     size(): number;
-    forEach(passedFunction: any, thisArg?: any): void;
+    forEach(passedFunction: (option: AbstractJDLOption) => void, thisArg?: any): void;
     toString(indent?: number): string;
 }

package/dist/types/jdl/models/jdl-relationship.d.ts

@@ -1,20 +1,26 @@
 import { RelationshipSide, JDLRelationshipType } from '../basic-types/relationships.js';
 export type JDLRelationshipOptions = Record<'global' | 'source' | 'destination', Record<string, any>>;
+export type JDLSourceEntitySide = {
+    sourceEntity: string;
+    injectedFieldInSourceEntity?: string;
+    injectedFieldInSourceIsRequired: boolean;
+    commentForSourceEntity?: string;
+};
 export type JDLRelationshipModel = {
-    side: RelationshipSide | undefined;
+    side?: RelationshipSide;
     from: string;
     to: string;
     type: JDLRelationshipType;
     options: JDLRelationshipOptions;
-    injectedFieldInFrom: null | string;
-    injectedFieldInTo: null | string;
+    injectedFieldInFrom?: string | null;
+    injectedFieldInTo?: string | null;
     isInjectedFieldInFromRequired: boolean;
     isInjectedFieldInToRequired: boolean;
-    commentInFrom: null | string;
-    commentInTo: null | string;
+    commentInFrom?: string | null;
+    commentInTo?: string | null;
 };
 export default class JDLRelationship implements JDLRelationshipModel {
-    side: RelationshipSide | undefined;
+    side?: RelationshipSide;
     from: string;
     to: string;
     type: JDLRelationshipType;
@@ -23,12 +29,12 @@ export default class JDLRelationship implements JDLRelationshipModel {
         source: Record<string, any>;
         destination: Record<string, any>;
     };
-    injectedFieldInFrom: null | string;
-    injectedFieldInTo: null | string;
+    injectedFieldInFrom?: string | null;
+    injectedFieldInTo?: string | null;
     isInjectedFieldInFromRequired: boolean;
     isInjectedFieldInToRequired: boolean;
-    commentInFrom: null | string;
-    commentInTo: null | string;
+    commentInFrom?: string | null;
+    commentInTo?: string | null;
     constructor(args: Partial<JDLRelationshipModel> & Pick<JDLRelationshipModel, 'from' | 'to' | 'type'>);
     /**
      * Returns a constructed ID representing this relationship.

package/dist/types/jdl/models/jdl-relationships.d.ts

@@ -22,11 +22,11 @@ export default class JDLRelationships {
     relationships: Record<JDLRelationshipType, Map<string, JDLRelationship>>;
     constructor();
     add(relationship: JDLRelationship): void;
-    getOneToOne(relationshipId: any): JDLRelationship;
-    getOneToMany(relationshipId: any): JDLRelationship;
-    getManyToOne(relationshipId: any): JDLRelationship;
-    getManyToMany(relationshipId: any): JDLRelationship;
-    get(type: any, relationshipId: any): JDLRelationship;
+    getOneToOne(relationshipId: string): JDLRelationship | undefined;
+    getOneToMany(relationshipId: string): JDLRelationship | undefined;
+    getManyToOne(relationshipId: string): JDLRelationship | undefined;
+    getManyToMany(relationshipId: string): JDLRelationship | undefined;
+    get(type: JDLRelationshipType, relationshipId: string): JDLRelationship | undefined;
     oneToOneQuantity(): number;
     oneToManyQuantity(): number;
     manyToOneQuantity(): number;

package/dist/types/jdl/models/jdl-validation.d.ts

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 export default class JDLValidation {
-    name: any;
-    value: any;
-    constructor(args: any);
+    name: string;
+    value?: string | number | RegExp | boolean;
+    constructor(args: Partial<JDLValidation>);
     toString(): string;
 }

package/dist/types/jdl/models/list-jdl-application-configuration-option.d.ts

@@ -17,8 +17,9 @@
  * limitations under the License.
  */
 import JDLApplicationConfigurationOption from './jdl-application-configuration-option.js';
-export default class ListJDLApplicationConfigurationOption extends JDLApplicationConfigurationOption {
-    constructor(name: any, value: any);
-    getValue(): any[];
+export default class ListJDLApplicationConfigurationOption extends JDLApplicationConfigurationOption<any> {
+    quoted: boolean;
+    constructor(name: string, value: string[], quoted?: boolean);
+    getValue(): string[];
     toString(): string;
 }

package/dist/types/jdl/models/string-jdl-application-configuration-option.d.ts

@@ -17,8 +17,8 @@
  * limitations under the License.
  */
 import JDLApplicationConfigurationOption from './jdl-application-configuration-option.js';
-export default class StringJDLApplicationConfigurationOption extends JDLApplicationConfigurationOption {
+export default class StringJDLApplicationConfigurationOption extends JDLApplicationConfigurationOption<string> {
     quoted: boolean;
-    constructor(name: any, value: any, quoted?: boolean);
+    constructor(name: string, value: string, quoted?: boolean);
     toString(): string;
 }

package/dist/types/jdl/parsing/jdl-ast-builder-visitor.d.ts

@@ -134,5 +134,6 @@ export default class JDLAstBuilderVisitor extends BaseJDLCSTVisitor {
     configValue(context: any): any;
     qualifiedName(context: any): any;
     list(context: any): any;
+    quotedList(context: any): any;
 }
 export {};

package/dist/types/jdl/parsing/jdl-parser.d.ts

@@ -62,5 +62,6 @@ export default class JDLParser extends CstParser {
     configValue(): any;
     qualifiedName(): any;
     list(): any;
+    quotedList(): any;
     applicationSubEntities(): any;
 }

package/dist/types/jdl/parsing/jdl-parsing-types.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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 type JDLJSONApplicationConfiguration = {
+  config: Record<string, string>;
+  entities?: any;
+} & Record<string, any>;

package/dist/types/jdl/parsing/lexer/lexer.d.ts

@@ -16,6 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Lexer } from 'chevrotain';
-export declare const tokens: any;
+import { Lexer, TokenType } from 'chevrotain';
+export declare const tokens: Record<string, TokenType> & {
+    UNARY_OPTION: TokenType;
+    BINARY_OPTION: TokenType;
+    NAME: TokenType;
+};
 export declare const JDLLexer: Lexer;

package/dist/types/jdl/parsing/validator.d.ts

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type JDLValidatorOptionType = 'BOOLEAN' | 'INTEGER' | 'list' | 'NAME' | 'qualifiedName' | 'STRING';
+export type JDLValidatorOptionType = 'BOOLEAN' | 'INTEGER' | 'list' | 'NAME' | 'qualifiedName' | 'STRING' | 'quotedList';
 export type JDLValidatorOption = {
     type: JDLValidatorOptionType;
     pattern?: RegExp;

package/dist/types/jdl/utils/array-utils.d.ts

@@ -17,3 +17,4 @@
  * limitations under the License.
  */
 export default function deduplicate<T>(array: T[]): T[];
+export declare function join(set: unknown[], separator?: string, quoted?: boolean): string;

package/dist/types/jdl/utils/set-utils.d.ts

@@ -1,20 +1,2 @@
-/**
- * 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 declare function addAll<T>(set: Set<T>, elements: T[]): Set<T>;
-export declare function join(set: Set<unknown>, separator?: string): string;
+export declare function join(set: Set<unknown>, separator?: string, quoted?: boolean): string;

package/dist/types/jdl/validators/deployment-validator.d.ts

@@ -17,7 +17,8 @@
  * limitations under the License.
  */
 import Validator from './validator.js';
+import JDLDeployment from '../models/jdl-deployment.js';
 export default class DeploymentValidator extends Validator {
     constructor();
-    validate(jdlDeployment: any, options?: {}): void;
+    validate(jdlDeployment: JDLDeployment, options?: {}): void;
 }

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

@@ -1,10 +1,14 @@
 import type { BaseEnvironmentOptions, GetGeneratorConstructor, BaseGenerator as YeomanGenerator } from '@yeoman/types';
 import { YeomanTest, RunContext, RunContextSettings, RunResult } from 'yeoman-test';
 import type { JHipsterGeneratorOptions } from '../generators/base/api.js';
-type BaseEntity = any;
+import type { JSONEntity } from '../jdl/converters/types.js';
+import CoreGenerator from '../generators/base-core/generator.js';
+type BaseEntity = {
+    name: string;
+} & JSONEntity;
 type GeneratorTestType = YeomanGenerator<JHipsterGeneratorOptions>;
 type GeneratorTestOptions = JHipsterGeneratorOptions;
-type JHipsterRunResult<GeneratorType extends YeomanGenerator = YeomanGenerator> = RunResult<GeneratorType> & {
+type JHipsterRunResult<GeneratorType extends CoreGenerator = CoreGenerator> = RunResult<GeneratorType> & {
     /**
      * First argument of mocked source calls.
      */
@@ -14,11 +18,16 @@ type JHipsterRunResult<GeneratorType extends YeomanGenerator = YeomanGenerator>
      */
     composedMockedGenerators: string[];
 };
-declare const runResult: JHipsterRunResult<YeomanGenerator>;
+declare const runResult: JHipsterRunResult<CoreGenerator>;
 export { runResult, runResult as result };
 export declare const defineDefaults: ({ mockFactory }?: {
     mockFactory?: any;
 }) => Promise<void>;
+export declare const createJHipsterConfigFiles: (configuration: Record<string, unknown>, entities?: BaseEntity[]) => {
+    [x: string]: BaseEntity | {
+        'generator-jhipster': Record<string, unknown>;
+    };
+};
 export type FakeBlueprintOptions = {
     packageJson?: any;
     generator?: string | string[];
@@ -36,6 +45,7 @@ declare class JHipsterRunContext extends RunContext<GeneratorTestType> {
     private workspaceApplications;
     private commonWorkspacesConfig;
     private generateApplicationsSet;
+    withOptions(options: Partial<Omit<JHipsterGeneratorOptions, 'env' | 'resolved' | 'namespace'> & Record<string, any>>): this;
     withJHipsterConfig(configuration?: Record<string, unknown>, entities?: BaseEntity[]): this;
     withSkipWritingPriorities(): this;
     withWorkspacesCommonConfig(commonWorkspacesConfig: Record<string, unknown>): this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "8.4.0",
+  "version": "8.5.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -89,6 +89,7 @@
     "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",
+    "check-types": "tsc -p tsconfig.spec.json",
     "clean": "rimraf dist",
     "compile": "tsc",
     "compile-types": "tsc -p tsconfig.types.json",
@@ -106,7 +107,7 @@
     "prepare": "npm run build",
     "prettier:check": "prettier --check \"{,**/}*.{js,ts,cjs,mjs,cts,mts,json,md,yml,java}\"",
     "prettier:format": "prettier --write \"{,**/}*.{js,ts,cjs,mjs,cts,mts,json,md,yml,java}\"",
-    "pretest": "npm run lint",
+    "pretest": "npm run lint && npm run check-types",
     "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"
@@ -115,18 +116,18 @@
     "@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.7.1",
-    "@typescript-eslint/parser": "7.7.1",
+    "@types/lodash": "4.17.4",
+    "@typescript-eslint/eslint-plugin": "7.11.0",
+    "@typescript-eslint/parser": "7.11.0",
     "@yeoman/adapter": "1.4.0",
     "@yeoman/conflicter": "2.0.0",
     "@yeoman/namespace": "1.0.0",
     "@yeoman/transform": "1.2.0",
     "@yeoman/types": "1.2.0",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
     "chalk": "5.3.0",
     "chevrotain": "11.0.3",
-    "commander": "12.0.0",
+    "commander": "12.1.0",
     "conf": "12.0.0",
     "debug": "4.3.4",
     "didyoumean": "1.2.2",
@@ -135,38 +136,38 @@
     "ejs": "3.1.10",
     "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.12",
+    "eslint-plugin-unused-imports": "3.2.0",
+    "execa": "9.1.0",
+    "fast-xml-parser": "4.4.0",
+    "glob": "10.4.1",
     "isbinaryfile": "5.0.2",
     "java-lint": "0.3.0",
     "js-yaml": "4.1.0",
     "latest-version": "9.0.0",
     "lodash-es": "4.17.21",
     "mem-fs": "4.1.0",
-    "mem-fs-editor": "11.0.0",
+    "mem-fs-editor": "11.0.1",
     "minimatch": "9.0.4",
     "normalize-path": "3.0.0",
     "os-locale": "6.0.2",
     "p-transform": "4.1.5",
     "parse-gitignore": "2.0.0",
-    "piscina": "4.4.0",
+    "piscina": "4.5.1",
     "pluralize": "8.0.0",
     "prettier": "3.2.5",
     "prettier-plugin-java": "2.6.0",
     "prettier-plugin-packagejson": "2.5.0",
     "prettier-plugin-properties": "0.3.0",
     "randexp": "0.5.3",
-    "semver": "7.6.0",
+    "semver": "7.6.2",
     "simple-git": "3.24.0",
     "sort-keys": "5.0.0",
-    "type-fest": "4.18.0",
+    "type-fest": "4.18.3",
     "typescript": "5.4.5",
     "winston": "3.13.0",
     "yaml": "2.4.2",
     "yeoman-environment": "4.4.0",
-    "yeoman-generator": "7.1.1"
+    "yeoman-generator": "7.2.0"
   },
   "devDependencies": {
     "@actions/core": "1.10.1",
@@ -179,23 +180,23 @@
     "ejs-lint": "2.0.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-chai-friendly": "0.7.4",
+    "eslint-plugin-chai-friendly": "0.8.0",
     "eslint-plugin-mocha": "10.4.3",
     "eslint-plugin-prettier": "5.1.3",
     "esmocha": "1.2.0",
     "jest-extended": "4.0.2",
-    "jsdoc": "4.0.2",
-    "octokit": "3.2.0",
+    "jsdoc": "4.0.3",
+    "octokit": "4.0.2",
     "open-cli": "8.0.0",
     "prettier2": "npm:prettier@2.8.8",
     "quibble": "0.9.2",
-    "rimraf": "5.0.5",
-    "sinon": "17.0.1",
+    "rimraf": "5.0.7",
+    "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "yeoman-test": "8.2.0"
+    "yeoman-test": "8.3.0"
   },
   "peerDependencies": {
-    "yeoman-test": "8.2.0"
+    "yeoman-test": "8.3.0"
   },
   "peerDependenciesMeta": {
     "yeoman-test": {