internal: adjust task inferring

Author: mshima

generators/base-application/support/task-type-inference.ts

@@ -31,9 +31,11 @@ export function asPromptingTask<E = Entity, A = ApplicationType<E>, const G exte
   return task;
 }
 
-export function asPostPreparingEachEntityTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = BaseApplicationGenerator>(
-  task: (this: G, params: TaskTypes<E, A>['PostPreparingEachEntityTaskParam']) => void,
-) {
+export function asPostPreparingEachEntityTask<
+  E = Entity,
+  A = ApplicationType<E>,
+  const G extends BaseApplicationGenerator = BaseApplicationGenerator,
+>(task: (this: G, params: TaskTypes<E, A>['PostPreparingEachEntityTaskParam']) => void) {
   return task;
 }
 
@@ -43,9 +45,11 @@ export function asWritingTask<E = Entity, A = ApplicationType<E>, const G extend
   return task;
 }
 
-export function asWritingEntitiesTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = BaseApplicationGenerator>(
-  task: (this: G, params: TaskTypes<E, A>['WritingEntitiesTaskParam']) => void,
-) {
+export function asWritingEntitiesTask<
+  E = Entity,
+  A = ApplicationType<E>,
+  const G extends BaseApplicationGenerator = BaseApplicationGenerator,
+>(task: (this: G, params: TaskTypes<E, A>['WritingEntitiesTaskParam']) => void) {
   return task;
 }
 
@@ -55,8 +59,10 @@ export function asPostWritingTask<E = Entity, A = ApplicationType<E>, const G ex
   return task;
 }
 
-export function asPostWritingEntitiesTask<E = Entity, A = ApplicationType<E>, const G extends CoreGenerator = BaseApplicationGenerator>(
-  task: (this: G, params: TaskTypes<E, A>['PostWritingEntitiesTaskParam']) => void,
-) {
+export function asPostWritingEntitiesTask<
+  E = Entity,
+  A = ApplicationType<E>,
+  const G extends BaseApplicationGenerator = BaseApplicationGenerator,
+>(task: (this: G, params: TaskTypes<E, A>['PostWritingEntitiesTaskParam']) => void) {
   return task;
 }

generators/base-core/generator.ts

@@ -76,7 +76,8 @@ import { dockerPlaceholderGenerator } from '../docker/utils.js';
 import { getConfigWithDefaults } from '../../lib/jhipster/index.js';
 import { extractArgumentsFromConfigs } from '../../lib/command/index.js';
 import type BaseApplicationGenerator from '../base-application/generator.js';
-import type { CleanupArgumentType, Config, Control } from '../base/types.js';
+import type { CleanupArgumentType, Control } from '../base/types.js';
+import type { Config } from '../base-core/types.js';
 import type { GenericTaskGroup } from '../../lib/types/base/tasks.js';
 import { convertWriteFileSectionsToBlocks } from './internal/index.js';
 

generators/base/generator.ts

@@ -26,7 +26,7 @@ import { union } from 'lodash-es';
 import { packageJson } from '../../lib/index.js';
 import CoreGenerator from '../base-core/index.js';
 import type { TaskTypes as BaseTaskTypes, GenericTaskGroup } from '../../lib/types/base/tasks.js';
-import type { Config } from './types.js';
+import type { Config } from '../base-core/types.js';
 import { packageNameToNamespace } from './support/index.js';
 import { loadBlueprintsFromConfiguration, mergeBlueprints, normalizeBlueprintName, parseBluePrints } from './internal/index.js';
 import { PRIORITY_NAMES } from './priorities.js';

generators/info/generator.ts

@@ -29,11 +29,12 @@ import { JHIPSTER_CONFIG_DIR, YO_RC_FILE } from '../generator-constants.js';
 import { applicationsLookup } from '../workspaces/support/applications-lookup.js';
 import type { Entity } from '../../lib/types/base/entity.js';
 import { getEntitiesFromDir } from '../base-application/support/index.js';
+import type { Config } from '../base-core/types.js';
 import { replaceSensitiveConfig } from './support/utils.js';
 
 const isInfoCommand = commandName => commandName === 'info' || undefined;
 
-export default class InfoGenerator extends BaseCoreGenerator<{ appsFolders?: string[]; baseName?: string; packages?: string[] }> {
+export default class InfoGenerator extends BaseCoreGenerator<Config & { appsFolders?: string[]; baseName?: string; packages?: string[] }> {
   constructor(args: string | string[], options: JHipsterGeneratorOptions, features: JHipsterGeneratorFeatures) {
     super(args, options, {
       jhipsterBootstrap: false,

lib/types/application/yo-rc.d.ts

@@ -2,7 +2,7 @@
 import type { Simplify } from 'type-fest';
 import type { ExportStoragePropertiesFromCommand } from '../../command/types.js';
 import type { YO_RC_CONFIG_KEY } from '../../utils/yo-rc.ts';
-import type { Config } from '../../../generators/base/types.js';
+import type { Config } from '../../../generators/base-core/types.js';
 
 type BaseApplicationConfig = {
   entities?: string[];