generator-jhipster 8.6.0 → 8.7.0

package/dist/lib/eslint/index.js

@@ -0,0 +1,4 @@
+import recommended from './recommended.js';
+import base from './base.js';
+recommended.recommended = recommended;
+export default { ...recommended, recommended, base };

package/dist/lib/eslint/recommended.js

@@ -1,5 +1,6 @@
 import js from '@eslint/js';
 import baseConfig from './base.js';
+/** @type {import('typescript-eslint').ConfigWithExtends} */
 const recommended = {
     languageOptions: {
         ecmaVersion: 2022,

package/dist/lib/index.js

@@ -11,5 +11,4 @@ export const getPackageRoot = (relativePath) => {
     const packageDirectory = isDistFolder() ? join(sourceRoot, '..') : sourceRoot;
     return relativePath ? join(packageDirectory, relativePath) : packageDirectory;
 };
-// eslint-disable-next-line import/prefer-default-export
 export const packageJson = JSON.parse(readFileSync(getPackageRoot('package.json')).toString());

package/dist/lib/internal/config-def.js

@@ -8,7 +8,6 @@ export const convertConfigToOption = (name, config) => {
         description: config.description,
         choices,
         scope: config.scope ?? 'storage',
-        ...(config.prompt && typeof config.default !== 'function' ? {} : { default: config.default }),
         ...config.cli,
     };
 };
@@ -20,7 +19,6 @@ export function loadConfig(configsDef, { application, config }) {
                 let source = config;
                 if (!source) {
                     if (def.scope === 'generator') {
-                        // eslint-disable-next-line @typescript-eslint/no-this-alias
                         source = this;
                     }
                     else if (def.scope === 'blueprint') {
@@ -31,8 +29,8 @@ export function loadConfig(configsDef, { application, config }) {
                     }
                 }
                 value = application[name] = source[name] ?? undefined;
-                if (value === undefined && def.default) {
-                    application[name] = typeof def.default === 'function' ? def.default(source) : def.default;
+                if (value === undefined && def.default !== undefined) {
+                    application[name] = typeof def.default === 'function' ? def.default.call(this, source) : def.default;
                 }
             }
         }

package/dist/testing/github.js

@@ -1,7 +1,7 @@
-import axios from 'axios';
 import { randomUUID } from 'node:crypto';
 import { appendFileSync, existsSync } from 'node:fs';
 import { EOL } from 'node:os';
+import axios from 'axios';
 export const parseIssue = (issue) => {
     if (issue.includes('#')) {
         const split = issue.split('/');

package/dist/testing/helpers.js

@@ -1,28 +1,31 @@
-import { YeomanTest, RunContext, result } from 'yeoman-test';
-import { merge, set } from 'lodash-es';
-import { globSync } from 'glob';
 import { basename, dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import { merge, set, snakeCase } from 'lodash-es';
+import { RunContext, YeomanTest, result } from 'yeoman-test';
+import { globSync } from 'glob';
 import EnvironmentBuilder from '../cli/environment-builder.mjs';
 import { JHIPSTER_CONFIG_DIR } from '../generators/generator-constants.js';
 import { GENERATOR_WORKSPACES } from '../generators/generator-list.js';
-import getGenerator from './get-generator.js';
 import { createJHipsterLogger, normalizePathEnd, parseCreationTimestamp } from '../generators/base/support/index.js';
 import BaseGenerator from '../generators/base/index.js';
 import { getPackageRoot, isDistFolder } from '../lib/index.js';
+import getGenerator from './get-generator.js';
 const runResult = result;
 export { runResult, runResult as result };
 const DEFAULT_TEST_SETTINGS = { forwardCwd: true };
 const DEFAULT_TEST_OPTIONS = { skipInstall: true };
 const DEFAULT_TEST_ENV_OPTIONS = { skipInstall: true, dryRun: false };
 const generatorsDir = join(fileURLToPath(import.meta.url), '../../generators');
-const mockedGenerators = [
+const allGenerators = [
     ...globSync('*/index.{j,t}s', { cwd: generatorsDir, posix: true }).map(file => dirname(file)),
     ...globSync('*/generators/*/index.{j,t}s', { cwd: generatorsDir, posix: true }).map(file => dirname(file).replace('/generators/', ':')),
 ]
-    .filter(gen => !gen.startsWith('bootstrap-'))
     .map(gen => `jhipster:${gen}`)
     .sort();
+const filterBootstrapGenerators = (gen) => !gen.startsWith('jhipster:bootstrap-');
+const composedGeneratorsToCheck = allGenerators
+    .filter(filterBootstrapGenerators)
+    .filter(gen => !['jhipster:bootstrap', 'jhipster:project-name'].includes(gen));
 const defaultSharedApplication = Object.fromEntries(['CLIENT_WEBPACK_DIR'].map(key => [key, undefined]));
 let defaultMockFactory;
 export const defineDefaults = async ({ mockFactory } = {}) => {
@@ -183,17 +186,27 @@ class JHipsterRunContext extends RunContext {
         merge(this.sharedApplication, sharedApplication);
         return this.withSharedData({ sharedApplication: this.sharedApplication });
     }
+    withMockedNodeDependencies() {
+        return this.withSharedApplication({
+            nodeDependencies: new Proxy({}, { get: (_target, prop) => `${snakeCase(prop.toString()).toUpperCase()}_VERSION` }),
+        });
+    }
     /**
-     * Mock every built-in generators except the ones in the exceptList and bootstrap-* generators.
+     * Mock every built-in generators except the ones in the except and bootstrap-* generators.
      * Note: Boostrap generator is mocked by default.
      * @example
-     * withMockedJHipsterGenerators(['jhipster:bootstrap'])
+     * withMockedJHipsterGenerators({ except: ['jhipster:bootstrap'] })
+     * @example
+     * withMockedJHipsterGenerators({ except: ['bootstrap', 'server'] })
      * @example
-     * withMockedJHipsterGenerators(['bootstrap', 'server'])
+     * // Mock every generator including bootstrap-*
+     * withMockedJHipsterGenerators({ filter: () => true })
      */
-    withMockedJHipsterGenerators(exceptList = []) {
-        exceptList = exceptList.map(gen => (gen.startsWith('jhipster:') ? gen : `jhipster:${gen}`));
-        return this.withMockedGenerators(mockedGenerators.filter(gen => !exceptList.includes(gen) && this.Generator !== gen));
+    withMockedJHipsterGenerators(options = {}) {
+        const optionsObj = Array.isArray(options) ? { except: options } : options;
+        const { except = [], filter = filterBootstrapGenerators } = optionsObj;
+        const jhipsterExceptList = except.map(gen => (gen.startsWith('jhipster:') ? gen : `jhipster:${gen}`));
+        return this.withMockedGenerators(allGenerators.filter(filter).filter(gen => !jhipsterExceptList.includes(gen) && this.Generator !== gen));
     }
     withGradleBuildTool() {
         return this.withFiles({
@@ -222,7 +235,7 @@ plugins {
     async run() {
         const runResult = (await super.run());
         if (this.sharedSource) {
-            const sourceCallsArg = Object.fromEntries(Object.entries(this.sharedSource).map(([name, fn]) => [name, fn.mock.calls.map(args => args[0])]));
+            const sourceCallsArg = Object.fromEntries(Object.entries(this.sharedSource).map(([name, fn]) => [name, fn.mock.calls.map(args => (args.length > 1 ? args : args[0]))]));
             if (sourceCallsArg.addEntitiesToClient) {
                 sourceCallsArg.addEntitiesToClient = sourceCallsArg.addEntitiesToClient.map(({ application, entities }) => ({
                     application: `Application[${application.baseName}]`,
@@ -237,7 +250,7 @@ plugins {
             }
             runResult.sourceCallsArg = sourceCallsArg;
         }
-        runResult.composedMockedGenerators = mockedGenerators.filter(gen => runResult.mockedGenerators[gen]?.called && !['jhipster:bootstrap', 'jhipster:project-name'].includes(gen));
+        runResult.composedMockedGenerators = composedGeneratorsToCheck.filter(gen => runResult.mockedGenerators[gen]?.called);
         return runResult;
     }
 }
@@ -310,6 +323,7 @@ const commonTestOptions = {
     noInsight: true,
     useVersionPlaceholders: true,
     fakeKeytool: true,
+    skipGit: true,
 };
 export const basicHelpers = createTestHelpers({ generatorOptions: { ...commonTestOptions } });
 export const defaultHelpers = createTestHelpers({

package/dist/testing/support/client-samples.js

@@ -1,4 +1,4 @@
-import { MatrixMonolith, MatrixMicroserviceGateway } from './application-samples.js';
+import { MatrixMicroserviceGateway, MatrixMonolith } from './application-samples.js';
 import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix, fromMatrix } from './matrix-utils.js';
 const CLIENT_ADDITIONAL_CONFIG_MATRIX = {
     withAdminUi: [false, true],
@@ -18,5 +18,4 @@ export const buildClientSamples = (commonConfig) => {
     clientMatrix = extendMatrix(clientMatrix, CLIENT_ADDITIONAL_CONFIG_MATRIX);
     return buildSamplesFromMatrix(clientMatrix, { commonConfig });
 };
-// eslint-disable-next-line import/prefer-default-export
 export const clientSamples = buildClientSamples();

package/dist/testing/support/matrix-utils.js

@@ -7,18 +7,21 @@ const appendTitle = (title, config, value) => {
     const newTitle = typeof value === 'string' && value !== 'no' ? value : `${config}(${value})`;
     return `${title}${title.length === 0 ? '' : '-'}${newTitle}`;
 };
-export const fromMatrix = configMatrix => {
+/**
+ * Create a matrix from a options
+ * @example
+ * const matrix = fromMatrix({ a: [true, false], b: [true, false] });
+ * // {
+ * //  'a(true)-b(true)': { a: true, b: true },
+ * //  'a(true)-b(false)': { a: true, b: false },
+ * //  'a(false)-b(true)': { a: false, b: true },
+ * //  'a(false)-b(false)': { a: false, b: false },
+ * // }
+ */
+export const fromMatrix = (configMatrix) => {
     const configEntries = Object.entries(configMatrix);
     const samples = configEntries.reduce((previousValue, currentValue) => {
         const [config, configValues] = currentValue;
-        if (previousValue.length === 0) {
-            return configValues.map(value => [
-                value,
-                {
-                    [config]: value,
-                },
-            ]);
-        }
         return previousValue
             .map(([previousName, previousConfig]) => configValues.map(value => {
             return [
@@ -30,7 +33,7 @@ export const fromMatrix = configMatrix => {
             ];
         }))
             .flat();
-    }, []);
+    }, [['', {}]]);
     return Object.fromEntries(samples);
 };
 const applyExtendedMatrix = (matrixEntries, configMatrix) => {
@@ -65,6 +68,15 @@ const applyExtendedMatrix = (matrixEntries, configMatrix) => {
     });
     return matrixEntries;
 };
+/**
+ * Apply new matrix value to existing matrix
+ * @example
+ * const matrix = extendMatrix(fromMatrix({ initialMatrix: [true, false] }), { toBeMerged: [true, false] });
+ * // {
+ * //  'initialMatrix(true)-toBeMerged(true)': { initialMatrix: true, toBeMerged: true },
+ * //  'initialMatrix(false)-toBeMerged(false)': { initialMatrix: false, toBeMerged: false },
+ * // }
+ */
 export const extendMatrix = (matrix, configMatrix) => {
     return Object.fromEntries(applyExtendedMatrix(Object.entries(matrix), configMatrix));
 };

package/dist/testing/support/server-samples.js

@@ -1,6 +1,5 @@
-import { MatrixMonolith, MatrixMicroservice, MatrixGateway } from './application-samples.js';
-import { fromMatrix, extendMatrix, extendFilteredMatrix, buildSamplesFromMatrix } from './matrix-utils.js';
-// eslint-disable-next-line import/prefer-default-export
+import { MatrixGateway, MatrixMicroservice, MatrixMonolith } from './application-samples.js';
+import { buildSamplesFromMatrix, extendFilteredMatrix, extendMatrix, fromMatrix } from './matrix-utils.js';
 export const buildServerMatrix = (matrix = {}) => {
     let serverMatrix = {
         ...fromMatrix({

package/dist/types/generators/base/api.d.ts

@@ -1,11 +1,9 @@
-import type { BaseOptions, BaseFeatures, ArgumentSpec, CliOptionSpec } from 'yeoman-generator';
+import type { ArgumentSpec, BaseFeatures, BaseOptions, CliOptionSpec } from 'yeoman-generator';
 import type { RequireAtLeastOne, SetOptional } from 'type-fest';
 import type CoreGenerator from '../base-core/index.js';
 
 export type ApplicationWithConfig = {
-  config: {
-    [key: string]: string | boolean | number | string[];
-  };
+  config: Record<string, string | boolean | number | string[]>;
   entities: Record<string, unknown>;
 };
 
@@ -36,6 +34,9 @@ export type JHipsterGeneratorOptions = BaseOptions & {
   entities?: string[];
   disableBlueprints?: boolean;
 
+  /* Init based application */
+  fromInit?: boolean;
+
   /* blueprint options */
   blueprints?: string;
   blueprint?: any;
@@ -98,9 +99,20 @@ export type JHipsterGeneratorFeatures = BaseFeatures & {
    * Create transforms for commit.
    */
   commitTransformFactory?: () => any;
+
+  /**
+   * Queue tasks to handle command definitions.
+   *  - parse options and configurations from cli.
+   *  - prompt configurations.
+   *  - configure configurations.
+   *  - compose with generators defined in command.
+   *  - load configurations.
+   *
+   * Defaults to true for built-in generator-jhipster generators and false for blueprints.
+   */
+  queueCommandTasks?: boolean;
 };
 
-// eslint-disable-next-line no-use-before-define
 export type EditFileCallback<Generator = CoreGenerator> = (this: Generator, content: string, filePath: string) => string;
 
 export type EditFileOptions = { create?: boolean; ignoreNonExisting?: boolean | string; assertModified?: boolean };
@@ -127,7 +139,7 @@ export type WriteFileTemplate<Generator = CoreGenerator, DataType = any> =
       binary?: boolean;
       /** ejs options. Refer to https://ejs.co/#docs */
       options?: Record<string, object>;
-      override?: (this: Generator, data: DataType) => boolean;
+      override?: boolean | ((this: Generator, data: DataType) => boolean);
     };
 
 export type WriteFileBlock<Generator = CoreGenerator, DataType = any> = {
@@ -220,8 +232,11 @@ export type ConfigSpec = {
    * The callback receives the generator as input for 'generator' scope.
    * The callback receives jhipsterConfigWithDefaults as input for 'storage' (default) scope.
    * The callback receives blueprintStorage contents as input for 'blueprint' scope.
+   *
+   * Default value will not be applied to generator (using 'generator' scope) in initializing priority. Use cli.default instead.
+   * Default value will be application to templates context object (application) in loading priority.
    */
-  default?: string | boolean | string[] | ((any) => string | boolean | string[]);
+  default?: string | boolean | number | string[] | ((this: CoreGenerator | void, ctx: any) => string | boolean | number | string[]);
   /**
    * Configure the generator according to the selected configuration.
    */

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

@@ -1,7 +1,7 @@
 import type { ComposeOptions } from 'yeoman-generator';
+import CoreGenerator from '../base-core/index.js';
 import { BaseGeneratorDefinition, GenericTaskGroup } from './tasks.js';
 import type { JHipsterGeneratorFeatures, JHipsterGeneratorOptions } from './api.js';
-import CoreGenerator from '../base-core/index.js';
 /**
  * Base class that contains blueprints support.
  */

package/dist/types/generators/base/support/config.d.ts

@@ -44,7 +44,7 @@ export declare const pickFields: (source: Record<string | number, any>, fields:
  *   { prop: ({ prop }) => prop + '-bar', prop2: 'won\'t override' },
  * );
  */
-export declare const mutateData: (context: Record<string | number, any>, ...mutations: Array<Record<string | number, any> & {
+export declare const mutateData: (context: Record<string | number, any>, ...mutations: (Record<string | number, any> & {
     /** Set to false if you don't want functions to override the value */
     __override__?: boolean;
-}>) => void;
+})[]) => void;

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

@@ -22,7 +22,7 @@ export * from './config.js';
 export * from './contents.js';
 export * from './faker.js';
 export { default as getHipster } from './hipster.js';
-export { default as createJHipster7Context } from './jhipster7-context.js';
+export * from './jhipster7-context.js';
 export * from './logger.js';
 export * from './namespace.js';
 export * from './needles.js';