Lots of work related to implicit any (#30099)

Author: mshima

cli/program.mts

@@ -30,7 +30,7 @@ import { packageNameToNamespace } from '../lib/utils/index.js';
 import baseCommand from '../generators/base/command.js';
 import { GENERATOR_APP, GENERATOR_BOOTSTRAP, GENERATOR_JDL } from '../generators/generator-list.js';
 import { extractArgumentsFromConfigs, type JHipsterCommandDefinition } from '../lib/command/index.js';
-import { buildJDLApplicationConfig } from '../lib/command/jdl.js';
+import { buildJDLApplicationConfig } from '../lib/jdl-config/jhipster-jdl-config.ts';
 import logo from './logo.mjs';
 import EnvironmentBuilder from './environment-builder.mjs';
 import SUB_GENERATORS from './commands.mjs';

generators/liquibase/generator.ts

@@ -30,11 +30,12 @@ import {
   prepareRelationship,
 } from '../base-application/support/index.js';
 import { prepareSqlApplicationProperties } from '../spring-data-relational/support/index.js';
-import { checkAndReturnRelationshipOnValue, fieldTypes } from '../../lib/jhipster/index.js';
+import { fieldTypes } from '../../lib/jhipster/index.js';
 import type { MavenProperty } from '../maven/types.js';
 import type { HandleCommandTypes } from '../../lib/command/types.js';
 import type { Config as BaseApplicationConfig, Options as BaseApplicationOptions } from '../base-entity-changes/types.js';
 import type { Source as SpringBootSource } from '../spring-boot/index.js';
+import { checkAndReturnRelationshipOnValue } from './internal/relationship-on-handler-options.ts';
 import { liquibaseFiles } from './files.js';
 import {
   liquibaseComment,
@@ -157,8 +158,8 @@ export default class LiquibaseGenerator extends BaseEntityChangesGenerator<
     return this.asPreparingEachEntityRelationshipTaskGroup({
       prepareEntityRelationship({ application, entity, relationship }) {
         prepareRelationshipForLiquibase({ application, entity, relationship });
-        relationship.onDelete = checkAndReturnRelationshipOnValue(relationship.options?.onDelete, this);
-        relationship.onUpdate = checkAndReturnRelationshipOnValue(relationship.options?.onUpdate, this);
+        relationship.onDelete = checkAndReturnRelationshipOnValue(relationship.onDelete, this);
+        relationship.onUpdate = checkAndReturnRelationshipOnValue(relationship.onUpdate, this);
       },
     });
   }

lib/jhipster/relationship-on-handler-options.ts renamed to generators/liquibase/internal/relationship-on-handler-options.ts

@@ -17,6 +17,8 @@
  * limitations under the License.
  */
 
+import type { Logger } from '../../../lib/utils/logger.ts';
+
 const validOptions = ['NO ACTION', 'RESTRICT', 'CASCADE', 'SET NULL', 'SET DEFAULT'];
 
 /**
@@ -25,12 +27,12 @@ const validOptions = ['NO ACTION', 'RESTRICT', 'CASCADE', 'SET NULL', 'SET DEFAU
  * @param generator
  * @returns
  */
-export default function checkAndReturnRelationshipOnValue(onValue, generator) {
+export function checkAndReturnRelationshipOnValue(onValue: string | undefined, { log }: { log: Logger }) {
   let result = onValue;
 
   if (result) {
     if (!validOptions.includes(result)) {
-      generator.log.warn(`Invalid value '${result}' for onDelete or onUpdate - resetting to undefined.`);
+      log.warn(`Invalid value '${result}' for onDelete or onUpdate - resetting to undefined.`);
 
       result = undefined;
     }

generators/liquibase/types.d.ts

@@ -54,8 +54,8 @@ type Property = {
 export interface Relationship extends BaseEntityChangesRelationship, DatabaseRelationship, Property {
   columnDataType?: string;
 
-  onDelete?: boolean;
-  onUpdate?: boolean;
+  onDelete?: string;
+  onUpdate?: string;
 
   shouldWriteRelationship?: boolean;
 

generators/spring-cloud-stream/generator.spec.ts

@@ -58,4 +58,16 @@ describe(`generator - ${generator}`, () => {
       });
     });
   });
+
+  describe('invalid option in jdl', () => {
+    it('should fail', async () => {
+      await expect(
+        helpers
+          .runJDL('application { config { baseName jhipster, messageBroker foo } }')
+          .withMockedJHipsterGenerators()
+          .withMockedSource()
+          .withJHipsterConfig(),
+      ).rejects.toThrowError(`The value 'foo' is not allowed for the option 'messageBroker'`);
+    });
+  });
 });

generators/spring-cloud-stream/generators/kafka/__snapshots__/generator.spec.ts.snap

@@ -0,0 +1,116 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`generator - spring-cloud-stream:kafka jdl support should match files snapshot 1`] = `
+{
+  ".yo-rc.json": {
+    "contents": "{
+  "generator-jhipster": {
+    "baseName": "jhipster",
+    "creationTimestamp": 1577836800000,
+    "entities": [],
+    "messageBroker": "kafka"
+  }
+}
+",
+    "stateCleared": "modified",
+  },
+}
+`;
+
+exports[`generator - spring-cloud-stream:kafka with defaults options should call source snapshot 1`] = `
+{
+  "addIntegrationTestAnnotation": [
+    {
+      "annotation": "EmbeddedKafka",
+      "package": "com.mycompany.myapp.config",
+    },
+  ],
+  "addMainLog": [
+    {
+      "level": "INFO",
+      "name": "org.apache.kafka",
+    },
+    {
+      "level": "WARN",
+      "name": "org.apache.kafka",
+    },
+  ],
+  "addMavenDependency": [
+    [
+      {
+        "artifactId": "spring-cloud-stream",
+        "groupId": "org.springframework.cloud",
+      },
+      {
+        "artifactId": "spring-cloud-starter-stream-kafka",
+        "groupId": "org.springframework.cloud",
+      },
+      {
+        "artifactId": "spring-cloud-stream-test-binder",
+        "groupId": "org.springframework.cloud",
+        "scope": "test",
+      },
+      {
+        "artifactId": "junit-jupiter",
+        "groupId": "org.testcontainers",
+        "scope": "test",
+      },
+      {
+        "artifactId": "testcontainers",
+        "groupId": "org.testcontainers",
+        "scope": "test",
+      },
+      {
+        "artifactId": "kafka",
+        "groupId": "org.testcontainers",
+        "scope": "test",
+      },
+    ],
+  ],
+  "addTestLog": [
+    {
+      "level": "WARN",
+      "name": "kafka",
+    },
+    {
+      "level": "WARN",
+      "name": "org.I0Itec",
+    },
+  ],
+  "addTestSpringFactory": [
+    {
+      "key": "org.springframework.test.context.ContextCustomizerFactory",
+      "value": "com.mycompany.myapp.config.KafkaTestContainersSpringContextCustomizerFactory",
+    },
+  ],
+}
+`;
+
+exports[`generator - spring-cloud-stream:kafka with defaults options should match files snapshot 1`] = `
+{
+  ".yo-rc.json": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/broker/KafkaConsumer.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/broker/KafkaProducer.java": {
+    "stateCleared": "modified",
+  },
+  "src/main/java/com/mycompany/myapp/web/rest/JhipsterKafkaResource.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/EmbeddedKafka.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/KafkaTestContainer.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/KafkaTestContainersSpringContextCustomizerFactory.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/web/rest/JhipsterKafkaResourceIT.java": {
+    "stateCleared": "modified",
+  },
+}
+`;

generators/spring-cloud-stream/generators/kafka/generator.spec.ts

@@ -0,0 +1,67 @@
+/**
+ * Copyright 2013-2025 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 { basename, dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { before, describe, expect, it } from 'esmocha';
+
+import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js';
+import { defaultHelpers as helpers, result } from '../../../../lib/testing/index.js';
+import Generator from './index.js';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generator = `${basename(resolve(__dirname, '../../'))}:${basename(__dirname)}`;
+
+describe(`generator - ${generator}`, () => {
+  shouldSupportFeatures(Generator);
+  describe('blueprint support', () => testBlueprintSupport(generator));
+
+  describe('with defaults options', () => {
+    before(async () => {
+      await helpers.runJHipster(generator).withMockedJHipsterGenerators().withMockedSource().withSharedApplication({}).withJHipsterConfig();
+    });
+
+    it('should match files snapshot', () => {
+      expect(result.getStateSnapshot()).toMatchSnapshot();
+    });
+
+    it('should call source snapshot', () => {
+      expect(result.sourceCallsArg).toMatchSnapshot();
+    });
+
+    it('should compose with generators', () => {
+      expect(result.composedMockedGenerators).toMatchInlineSnapshot(`[]`);
+    });
+  });
+
+  describe('jdl support', () => {
+    before(async () => {
+      await helpers
+        .runJDL('application { config { baseName jhipster, messageBroker kafka } }')
+        .withMockedJHipsterGenerators()
+        .withMockedSource()
+        .withJHipsterConfig();
+    });
+
+    it('should match files snapshot', () => {
+      expect(result.getSnapshot()).toMatchSnapshot();
+    });
+  });
+});

generators/spring-cloud-stream/generators/pulsar/__snapshots__/generator.spec.ts.snap

@@ -0,0 +1,99 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`generator - spring-cloud-stream:pulsar jdl support should match files snapshot 1`] = `
+{
+  ".yo-rc.json": {
+    "contents": "{
+  "generator-jhipster": {
+    "baseName": "jhipster",
+    "creationTimestamp": 1577836800000,
+    "entities": [],
+    "messageBroker": "pulsar"
+  }
+}
+",
+    "stateCleared": "modified",
+  },
+}
+`;
+
+exports[`generator - spring-cloud-stream:pulsar with defaults options should call source snapshot 1`] = `
+{
+  "addIntegrationTestAnnotation": [
+    {
+      "annotation": "EmbeddedPulsar",
+      "package": "com.mycompany.myapp.config",
+    },
+  ],
+  "addMainLog": [
+    {
+      "level": "INFO",
+      "name": "org.apache.pulsar",
+    },
+  ],
+  "addMavenDefinition": [
+    {
+      "dependencies": [
+        {
+          "artifactId": "spring-cloud-stream",
+          "groupId": "org.springframework.cloud",
+        },
+        {
+          "artifactId": "spring-cloud-stream-binder-pulsar",
+          "groupId": "org.springframework.cloud",
+        },
+        {
+          "artifactId": "junit-jupiter",
+          "groupId": "org.testcontainers",
+          "scope": "test",
+        },
+        {
+          "artifactId": "testcontainers",
+          "groupId": "org.testcontainers",
+          "scope": "test",
+        },
+        {
+          "artifactId": "pulsar",
+          "groupId": "org.testcontainers",
+          "scope": "test",
+        },
+      ],
+      "properties": [
+        {
+          "property": "spring-pulsar.version",
+          "value": undefined,
+        },
+      ],
+    },
+  ],
+  "addTestSpringFactory": [
+    {
+      "key": "org.springframework.test.context.ContextCustomizerFactory",
+      "value": "com.mycompany.myapp.config.PulsarTestContainersSpringContextCustomizerFactory",
+    },
+  ],
+}
+`;
+
+exports[`generator - spring-cloud-stream:pulsar with defaults options should match files snapshot 1`] = `
+{
+  ".yo-rc.json": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/broker/PulsarIT.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/BrokerConfiguration.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/EmbeddedPulsar.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/PulsarTestContainer.java": {
+    "stateCleared": "modified",
+  },
+  "src/test/java/com/mycompany/myapp/config/PulsarTestContainersSpringContextCustomizerFactory.java": {
+    "stateCleared": "modified",
+  },
+}
+`;