generator-jhipster 8.5.0 → 8.6.0

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

@@ -1,6 +1,8 @@
 import { RequireOneOrNone } from 'type-fest';
 import { BaseApplication } from '../base-application/types.js';
 import { GradleApplication, GradleNeedleOptions } from '../gradle/types.js';
+import { JavaAnnotation } from './support/add-java-annotation.ts';
+import { EditFileCallback } from '../base/api.js';
 
 export type JavaDependencyVersion = {
   name: string;
@@ -73,4 +75,14 @@ export type JavaSourceType = {
   addJavaDependencies?(dependency: JavaDependency[], options?: JavaNeedleOptions): void;
   hasJavaProperty?(propertyName: string): boolean;
   hasJavaManagedProperty?(propertyName: string): boolean;
+
+  /**
+   * Edit a Java file by adding static imports, imports and annotations.
+   * Callbacks are passed to the editFile method.
+   */
+  editJavaFile?: (
+    file: string,
+    { staticImports, imports, annotations }: { staticImports?: string[]; imports?: string[]; annotations?: JavaAnnotation[] },
+    ...editFileCallback: EditFileCallback[]
+  ) => void;
 };

package/dist/types/generators/maven/internal/xml-store.d.ts

@@ -24,18 +24,19 @@ export default class XmlStorage {
     protected readonly parser: XMLParser;
     protected readonly builder: XMLBuilder;
     protected _cachedStore: any;
-    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, }: {
+    constructor({ saveFile, loadFile, xmlParserOptions, xmlBuildOptions, sortFile, }: {
         saveFile: (string: any) => void;
         loadFile: () => string;
         xmlParserOptions?: Partial<X2jOptions>;
         xmlBuildOptions?: Partial<XmlBuilderOptions>;
+        sortFile?: boolean;
     });
     clearCache(): void;
     save(sort?: boolean): void;
+    merge(source: any): void;
     protected sort(): void;
     protected persist(sort?: boolean): void;
     protected get store(): any;
     protected load(): void;
-    protected merge(source: any): void;
     protected mergeContent<T>(existing: T, newContent?: string): T;
 }

package/dist/types/generators/maven/support/pom-store.d.ts

@@ -20,9 +20,10 @@ import CoreGenerator from '../../base-core/index.js';
 import XmlStorage from '../internal/xml-store.js';
 import { MavenAnnotationProcessor, MavenDependency, MavenDistributionManagement, MavenPlugin, MavenProfile, MavenProperty, MavenRepository } from '../types.js';
 export default class PomStorage extends XmlStorage {
-    constructor({ saveFile, loadFile }: {
+    constructor({ saveFile, loadFile, sortFile }: {
         saveFile: (string: any) => void;
         loadFile: () => string;
+        sortFile?: boolean;
     });
     addProperty({ inProfile, property, value }: MavenProperty): void;
     addDependency({ inProfile, ...dependency }: MavenDependency): void;
@@ -44,4 +45,6 @@ export default class PomStorage extends XmlStorage {
     protected addPluginRepositoryAt(node: any, { releasesEnabled, snapshotsEnabled, ...repository }: MavenRepository): void;
     protected sort(): void;
 }
-export declare const createPomStorage: (generator: CoreGenerator) => PomStorage;
+export declare const createPomStorage: (generator: CoreGenerator, { sortFile }?: {
+    sortFile?: boolean;
+}) => PomStorage;

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

@@ -76,6 +76,7 @@ export type MavenDefinition = {
 };
 
 export type MavenSourceType = {
+  mergeMavenPomContent?(content: any): void;
   addMavenAnnotationProcessor?(artifact: MavenAnnotationProcessor | MavenAnnotationProcessor[]): void;
   addMavenDependency?(dependency: MavenDependency | MavenDependency[]): void;
   addMavenDependencyManagement?(dependency: MavenDependency | MavenDependency[]): void;

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

@@ -7,6 +7,7 @@ import { MessageBrokerApplicationType } from './options/message-broker.js';
 import type { DeterministicOptionWithDerivedProperties, OptionWithDerivedProperties } from '../base-application/application-options.js';
 import { ApplicationPropertiesNeedles } from './support/needles.ts';
 import { GatewayApplication } from '../spring-cloud/generators/gateway/types.ts';
+import { JavaAnnotation } from '../java/support/add-java-annotation.ts';
 
 export type SpringEntity = {
   /* Generate entity's Entity */
@@ -29,7 +30,7 @@ export type SpringBootSourceType = JavaSourceType &
     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?({ package, annotation }: { package?: string; annotation: 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;

package/dist/types/lib/eslint/base.d.ts

@@ -0,0 +1,20 @@
+export const baseRules: {
+    'no-unused-vars': string;
+    'import/no-duplicates': string;
+    'import/order': string;
+    'unused-imports/no-unused-imports': string;
+    'unused-imports/no-unused-vars': (string | {
+        vars: string;
+        varsIgnorePattern: string;
+        args: string;
+        argsIgnorePattern: string;
+    })[];
+};
+export default baseConfig;
+declare namespace baseConfig {
+    export let plugins: {
+        'unused-imports': any;
+        import: any;
+    };
+    export { baseRules as rules };
+}

package/dist/types/lib/eslint/recommended.d.ts

@@ -0,0 +1,20 @@
+declare const recommended: {
+    rules: any;
+    plugins: {
+        'unused-imports': any;
+        import: any;
+    };
+    languageOptions: {
+        ecmaVersion: number;
+        sourceType: string;
+    };
+    settings: {
+        'import/parsers': {
+            espree: string[];
+        };
+        'import/resolver': {
+            node: boolean;
+        };
+    };
+};
+export default recommended;

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

@@ -0,0 +1,11 @@
+export declare const parseIssue: (issue: string) => undefined | {
+    owner: string;
+    repository: string;
+    issue: string;
+};
+export declare const setGithubTaskOutput: (name: string, value: string | boolean | number) => void;
+export declare const getGithubIssue: ({ owner, repository, issue }: {
+    owner: string;
+    repository: string;
+    issue: string;
+}) => Promise<any>;

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

@@ -64,6 +64,14 @@ declare class JHipsterRunContext extends RunContext<GeneratorTestType> {
     withMockedSource(): this;
     withControl(sharedControl: Record<string, any>): this;
     withSharedApplication(sharedApplication: Record<string, any>): this;
+    /**
+     * Mock every built-in generators except the ones in the exceptList and bootstrap-* generators.
+     * Note: Boostrap generator is mocked by default.
+     * @example
+     * withMockedJHipsterGenerators(['jhipster:bootstrap'])
+     * @example
+     * withMockedJHipsterGenerators(['bootstrap', 'server'])
+     */
     withMockedJHipsterGenerators(exceptList?: string[]): this;
     withGradleBuildTool(): this;
     private withSharedData;

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

@@ -1,5 +1,7 @@
 export { default as getGenerator } from './get-generator.js';
 export * from './helpers.js';
+export * from './github.js';
+export * from './sample-config.js';
 export * from './support/application-samples.js';
 export * from './support/client-samples.js';
 export * from './support/entity-samples.js';

package/dist/types/testing/sample-config.d.ts

@@ -0,0 +1,4 @@
+import { InfoFile } from '../generators/info/support/extract-info.js';
+export declare const prepareSample: (projectFolder: string, files: InfoFile[], { removeBlueprints }?: {
+    removeBlueprints?: boolean;
+}) => Promise<InfoFile[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-jhipster",
-  "version": "8.5.0",
+  "version": "8.6.0",
   "description": "Spring Boot + Angular/React/Vue in one handy generator",
   "keywords": [
     "yeoman-generator",
@@ -45,6 +45,10 @@
       "default": "./dist/cli/index.mjs"
     },
     "./package.json": "./package.json",
+    "./eslint/recommended": {
+      "types": "./dist/types/lib/eslint/recommended.d.ts",
+      "default": "./dist/lib/eslint/recommended.js"
+    },
     "./generators": {
       "types": "./dist/types/generators/generator-list.d.ts",
       "default": "./dist/generators/generator-list.js"
@@ -113,12 +117,13 @@
     "update-snapshots": "esmocha jdl generators cli --update-snapshot --no-insight --forbid-only"
   },
   "dependencies": {
+    "@eslint/js": "9.5.0",
     "@faker-js/faker": "8.4.1",
     "@iarna/toml": "3.0.0",
     "@types/ejs": "3.1.5",
-    "@types/lodash": "4.17.4",
-    "@typescript-eslint/eslint-plugin": "7.11.0",
-    "@typescript-eslint/parser": "7.11.0",
+    "@types/lodash": "4.17.5",
+    "@typescript-eslint/eslint-plugin": "7.13.1",
+    "@typescript-eslint/parser": "7.13.1",
     "@yeoman/adapter": "1.4.0",
     "@yeoman/conflicter": "2.0.0",
     "@yeoman/namespace": "1.0.0",
@@ -128,8 +133,8 @@
     "chalk": "5.3.0",
     "chevrotain": "11.0.3",
     "commander": "12.1.0",
-    "conf": "12.0.0",
-    "debug": "4.3.4",
+    "conf": "13.0.0",
+    "debug": "4.3.5",
     "didyoumean": "1.2.2",
     "dockerfile-ast": "0.6.1",
     "dot-properties": "1.0.1",
@@ -137,9 +142,9 @@
     "eslint": "8.57.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-unused-imports": "3.2.0",
-    "execa": "9.1.0",
+    "execa": "9.3.0",
     "fast-xml-parser": "4.4.0",
-    "glob": "10.4.1",
+    "glob": "10.4.2",
     "isbinaryfile": "5.0.2",
     "java-lint": "0.3.0",
     "js-yaml": "4.1.0",
@@ -152,22 +157,22 @@
     "os-locale": "6.0.2",
     "p-transform": "4.1.5",
     "parse-gitignore": "2.0.0",
-    "piscina": "4.5.1",
+    "piscina": "4.6.0",
     "pluralize": "8.0.0",
-    "prettier": "3.2.5",
+    "prettier": "3.3.2",
     "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.2",
-    "simple-git": "3.24.0",
+    "simple-git": "3.25.0",
     "sort-keys": "5.0.0",
-    "type-fest": "4.18.3",
+    "type-fest": "4.20.1",
     "typescript": "5.4.5",
     "winston": "3.13.0",
-    "yaml": "2.4.2",
-    "yeoman-environment": "4.4.0",
-    "yeoman-generator": "7.2.0"
+    "yaml": "2.4.5",
+    "yeoman-environment": "4.4.1",
+    "yeoman-generator": "7.3.1"
   },
   "devDependencies": {
     "@actions/core": "1.10.1",
@@ -180,13 +185,12 @@
     "ejs-lint": "2.0.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-chai-friendly": "0.8.0",
+    "eslint-plugin-chai-friendly": "1.0.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.3",
-    "octokit": "4.0.2",
     "open-cli": "8.0.0",
     "prettier2": "npm:prettier@2.8.8",
     "quibble": "0.9.2",
@@ -204,7 +208,7 @@
     }
   },
   "engines": {
-    "node": "^18.13.0 || >= 20.6.1",
+    "node": "^18.19.0 || >= 20.6.1",
     "npm": ">=8.0.0"
   },
   "collective": {

package/dist/generators/generate-blueprint/templates/.eslintrc.json.ejs

@@ -1,35 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "es2022": true
-  },
-  "extends": ["eslint:recommended", "plugin:prettier/recommended"],
-  "parserOptions": {
-    "ecmaVersion": 13,
-    "sourceType": "module"
-  },
-  "overrides": [
-    {
-      "files": ["**/*.spec.{c,m,}js", "test/**/*.{c,m,}js"],
-    }
-  ],
-  "rules": {
-    "func-names": "off",
-    "no-restricted-syntax": [
-      "error",
-      {
-        "selector": "ForInStatement",
-        "message": "for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array."
-      },
-      {
-        "selector": "LabeledStatement",
-        "message": "Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand."
-      },
-      {
-        "selector": "WithStatement",
-        "message": "`with` is disallowed in strict mode because it makes code impossible to predict and optimize."
-      }
-    ],
-    "no-shadow": "off"
-  }
-}