adjusts

Author: mshima

generators/angular/index.ts

@@ -18,3 +18,4 @@
  */
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
+export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';

generators/app/index.ts

@@ -18,3 +18,4 @@
  */
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
+export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';

generators/app/types.d.ts

@@ -17,12 +17,39 @@
  * limitations under the License.
  */
 import type { CommandTypeMap } from '../../lib/command/types.ts';
-import type { Config as BaseApplicationConfig, Options as BaseApplicationOptions } from '../base-application/types.ts';
+import type {
+  Application as ClientApplication,
+  Config as ClientConfig,
+  Entity as ClientEntity,
+  Field as ClientField,
+  Options as ClientOptions,
+  Relationship as ClientRelationship,
+  Source as ClientSource,
+} from '../client/types.d.ts';
+import type {
+  Application as ServerApplication,
+  Config as ServerConfig,
+  Entity as ServerEntity,
+  Field as ServerField,
+  Options as ServerOptions,
+  Relationship as ServerRelationship,
+  Source as ServerSource,
+} from '../server/types.d.ts';
 
 import type command from './command.ts';
 
 type Command = CommandTypeMap<typeof command>;
 
-export type Config = Command['Config'] & BaseApplicationConfig;
+export type Config = Command['Config'] & ClientConfig & ServerConfig;
 
-export type Options = Command['Options'] & BaseApplicationOptions;
+export type Options = Command['Options'] & ClientOptions & ServerOptions;
+
+export type Source = ClientSource & ServerSource;
+
+export type Field = ClientField & ServerField;
+
+export interface Relationship extends ClientRelationship, ServerRelationship {}
+
+export type Entity<F extends Field = Field, R extends Relationship = Relationship> = ClientEntity<F, R> & ServerEntity<F, R>;
+
+export type Application = Command['Application'] & ClientApplication<Entity> & ServerApplication<Entity>;

generators/cypress/index.ts

@@ -19,3 +19,4 @@
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
 export { cypressEntityFiles, cypressFiles } from './files.ts';
+export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';

generators/cypress/types.d.ts

@@ -6,7 +6,7 @@ import type {
   Options as JavascriptOptions,
 } from '../client/types.ts';
 
-export type { Features, Field, Relationship } from '../client/types.ts';
+export type { Features, Field, Relationship, Source } from '../client/types.ts';
 import type command from './command.ts';
 
 type Command = CommandTypeMap<typeof command>;

generators/generate-blueprint/generators/standalone/generator.ts

@@ -72,6 +72,7 @@ export default class StandaloneBlueprintGenerator extends GenerateBlueprintBaseG
                 `.blueprint/generate-sample/command.${extension}`,
                 `.blueprint/generate-sample/generator.${extension}`,
                 `.blueprint/generate-sample/index.${extension}`,
+                ...(application.javascriptBlueprint ? [] : ['generators/base-generator.ts']),
                 // Always write cli for devBlueprint usage
                 `cli/${application.blueprintCliName}`,
                 { sourceFile: `cli/cli-customizations.c${application.javascriptBlueprint ? 'j' : 't'}s`, override: false },

generators/generate-blueprint/generators/standalone/templates/generators/base-generator.ts.ejs

@@ -0,0 +1,34 @@
+import type { JHipsterCommandDefinition } from 'generator-jhipster';
+import BaseApplicationGenerator from 'generator-jhipster/generators/base-application';
+import type {
+  Application as BaseApplication,
+  Config as BaseConfig,
+  Entity as BaseEntity,
+  Options as BaseOptions,
+  Source as BaseSource,
+} from 'generator-jhipster/generators/add';
+
+type <%- upperFirstCamelCaseBaseName %>BlueprintConfig = any;
+
+type <%- upperFirstCamelCaseBaseName %>Entity = BaseEntity;
+
+export type <%- upperFirstCamelCaseBaseName %>Application = BaseApplication<<%- upperFirstCamelCaseBaseName %>Entity> & {
+  <%- upperFirstCamelCaseBaseName %>EventChangelogDate: string;
+  auditedEntities: string[];
+};
+
+type <%- upperFirstCamelCaseBaseName %>Options = BaseOptions;
+
+type <%- upperFirstCamelCaseBaseName %>Source = BaseSource;
+
+export class <%- upperFirstCamelCaseBaseName %>ApplicationGenerator extends BaseApplicationGenerator<
+  <%- upperFirstCamelCaseBaseName %>Entity,
+  <%- upperFirstCamelCaseBaseName %>Application,
+  BaseConfig,
+  <%- upperFirstCamelCaseBaseName %>Options,
+  <%- upperFirstCamelCaseBaseName %>Source
+> {
+  declare blueprintConfig: <%- upperFirstCamelCaseBaseName %>BlueprintConfig;
+}
+
+export const asCommand = <const Def extends JHipsterCommandDefinition<<%- upperFirstCamelCaseBaseName %>ApplicationGenerator>>(command: Def): Def => command;

generators/java-simple-application/index.ts

@@ -18,3 +18,4 @@
  */
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
+export type { Application, Config, Options, Source } from './types.ts';

generators/languages/index.ts

@@ -18,4 +18,4 @@
  */
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
-export type { Application, Entity, Field, Relationship } from './types.ts';
+export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';

generators/liquibase/index.ts

@@ -18,4 +18,4 @@
  */
 export { default } from './generator.ts';
 export { default as command } from './command.ts';
-export type { Application, Entity, Field, Relationship, Source } from './types.d.ts';
+export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';