add initial command integration to jdl

generators/base/api.d.ts

@@ -1,6 +1,7 @@
 import type { ArgumentSpec, BaseFeatures, BaseOptions, CliOptionSpec } from 'yeoman-generator';
 import type { RequireAtLeastOne, SetOptional, Simplify, TaggedUnion, TupleToUnion, ValueOf } from 'type-fest';
 import type CoreGenerator from '../base-core/index.js';
+import { JHipsterOptionDefinition } from '../../jdl/types/types.js';
 import { MergeUnion } from './internal/merge-union.js';
 
 type ConfigScope = 'storage' | 'blueprint' | 'control' | 'generator';
@@ -233,6 +234,7 @@ export type ConfigSpec = {
   readonly prompt?:
     | PromptSpec
     | ((gen: CoreGenerator & { jhipsterConfigWithDefaults: Record<string, any> }, config: ConfigSpec) => PromptSpec);
+  readonly jdl?: Omit<JHipsterOptionDefinition, 'name', 'knownChoices'>;
   readonly scope?: 'storage' | 'blueprint' | 'generator';
   /**
    * The callback receives the generator as input for 'generator' scope.

generators/base/internal/command.ts

@@ -1,3 +1,4 @@
+import { JHipsterOptionDefinition } from '../../../jdl/types/types.js';
 import { JHipsterArguments, JHipsterConfigs } from '../api.js';
 
 export const extractArgumentsFromConfigs = (configs: JHipsterConfigs | undefined): JHipsterArguments => {
@@ -14,3 +15,8 @@ export const extractArgumentsFromConfigs = (configs: JHipsterConfigs | undefined
       ]),
   ) as JHipsterArguments;
 };
+
+export const extractJdlDefinitionFromCommand = (configs: JHipsterConfigs = {}): JHipsterOptionDefinition[] =>
+  Object.entries(configs)
+    .filter(([_name, def]) => def.jdl)
+    .map(([name, def]) => ({ name, ...def.jdl }));

generators/server/jdl/application-definition.ts

@@ -20,15 +20,17 @@ import { snakeCase, upperCase } from 'lodash-es';
 import { JDLApplicationConfig, JHipsterOptionDefinition } from '../../../jdl/types/types.js';
 import databaseMigrationOption from '../options/database-migration.js';
 import messageBrokerOption from '../options/message-broker.js';
-import { feignClientDefinition, syncUserWithIdpDefinition } from '../options/index.js';
+import { syncUserWithIdpDefinition } from '../options/index.js';
 import { jdlRoutesOptions } from '../../spring-cloud/generators/gateway/jdl/jdl-routes-option.js';
+import command from '../../spring-boot/command.js';
+import { extractJdlDefinitionFromCommand } from '../../base/internal/command.js';
 
 const jdlOptions: JHipsterOptionDefinition[] = [
   databaseMigrationOption,
   messageBrokerOption,
-  feignClientDefinition,
   syncUserWithIdpDefinition,
   jdlRoutesOptions,
+  ...extractJdlDefinitionFromCommand(command.configs),
 ];
 
 const applicationConfig: JDLApplicationConfig = {

generators/server/options/index.ts

@@ -19,5 +19,4 @@
 
 export * from './database-migration.js';
 export * from './message-broker.js';
-export * from './feign-client.js';
 export * from './sync-user-with-idp.js';

generators/spring-boot/command.ts

@@ -125,6 +125,10 @@ const command: JHipsterCommandDefinition = {
           [MICROSERVICE].includes(gen.jhipsterConfigWithDefaults.applicationType) &&
           (reactive ?? gen.jhipsterConfigWithDefaults.reactive) === false,
       }),
+      jdl: {
+        type: 'boolean',
+        tokenType: 'BOOLEAN',
+      },
       default: false,
     },
     syncUserWithIdp: {

generators/server/options/feign-client.spec.ts → generators/spring-boot/options/feign-client.spec.ts

@@ -1,6 +1,7 @@
 import { before, describe, expect, it } from 'esmocha';
 import { ImportState, createImporterFromContent } from '../../../jdl/jdl-importer.js';
-import { FEIGN_CLIENT as optionName } from './index.js';
+
+const optionName = 'feignClient';
 
 describe(`generators - server - jdl - ${optionName}`, () => {
   [true, false].forEach(optionValue => {