add jdl support to blueprints (#27291)

cli/cli-jdl.spec.ts

@@ -0,0 +1,33 @@
+import { join } from 'path';
+import { execa } from 'execa';
+import { basicHelpers as helpers, runResult } from '../lib/testing/index.js';
+import { getPackageRoot } from '../lib/index.js';
+
+const jhipsterCli = join(getPackageRoot(), 'bin/jhipster.cjs');
+
+describe('allows customizing JDL definitions', () => {
+  it('accepts a custom JDL definition', async () => {
+    await helpers
+      .prepareTemporaryDir()
+      .withFiles({
+        '.blueprint/app/index.mjs': `export const command = {
+  configs: {
+    fooConfig: {
+      jdl: {
+        type: 'boolean',
+        tokenType: 'BOOLEAN',
+      },
+      scope: 'storage',
+    },
+  },
+};`,
+      })
+      .commitFiles();
+    await execa(jhipsterCli, ['jdl', '--json-only', '--inline', 'application { config { fooConfig false } }'], { stdio: 'pipe' });
+    runResult.assertJsonFileContent('.yo-rc.json', {
+      'generator-jhipster': {
+        fooConfig: false,
+      },
+    });
+  });
+});

cli/jhipster-command.mjs

@@ -23,6 +23,9 @@ import { kebabCase } from 'lodash-es';
 import { convertConfigToOption } from '../lib/command/index.js';
 
 export default class JHipsterCommand extends Command {
+  configs = {};
+  blueprintConfigs = {};
+
   createCommand(name) {
     return new JHipsterCommand(name);
   }
@@ -177,6 +180,7 @@ export default class JHipsterCommand extends Command {
   }
 
   addJHipsterConfigs(configs = {}, blueprintOptionDescription) {
+    Object.assign(blueprintOptionDescription ? this.blueprintConfigs : this.configs, configs);
     Object.entries(configs).forEach(([name, config]) => {
       const option = convertConfigToOption(name, config);
       if (option) {

cli/program.mjs

@@ -28,6 +28,7 @@ import { packageNameToNamespace } from '../generators/base/support/index.js';
 import command from '../generators/base/command.js';
 import { GENERATOR_APP, GENERATOR_BOOTSTRAP, GENERATOR_JDL } from '../generators/generator-list.js';
 import { extractArgumentsFromConfigs } from '../lib/command/index.js';
+import { buildJDLApplicationConfig } from '../lib/command/jdl.js';
 import logo from './logo.mjs';
 import EnvironmentBuilder from './environment-builder.mjs';
 import SUB_GENERATORS from './commands.mjs';
@@ -56,6 +57,8 @@ const buildAllDependencies = async (generatorNames, { env, blueprintNamespaces }
     const meta = await env.getGeneratorMeta(namespace.includes(':') ? namespace : `${JHIPSTER_NS}:${namespace}`);
     if (meta) {
       allDependencies[namespace] = { meta, blueprintNamespace };
+    } else if (!blueprintNamespace) {
+      logger.warn(`Generator ${namespace} not found.`);
     }
     return meta?.importModule();
   };
@@ -276,6 +279,8 @@ export const buildCommands = async ({
         const command = everything.pop();
         const cmdOptions = everything.pop();
         const args = everything;
+        const commandsConfigs = Object.freeze({ ...command.configs, ...command.blueprintConfigs });
+        const jdlDefinition = buildJDLApplicationConfig(commandsConfigs);
         const options = {
           ...program.opts(),
           ...cmdOptions,
@@ -284,6 +289,8 @@ export const buildCommands = async ({
           entrypointGenerator,
           blueprints: envBuilder.getBlueprintsOption(),
           positionalArguments: args,
+          jdlDefinition,
+          commandsConfigs,
         };
         if (options.installPath) {
           // eslint-disable-next-line no-console