adjusts

Author: mshima

.blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/typescript/.yo-rc.json

@@ -3,6 +3,7 @@
     "additionalSubGenerators": "",
     "baseName": "foo",
     "cli": true,
+    "defaultCommand": "generate-blueprint",
     "localBlueprint": false,
     "generators": {
       "client": {
@@ -206,6 +207,7 @@
         "sbs": false
       }
     },
+    "javascriptBlueprint": false,
     "jhipsterVersion": "9.0.1",
     "mainGenerator": "generate-blueprint",
     "prettierDefaultIndent": 2,

generators/generate-blueprint/generator.ts

@@ -189,16 +189,18 @@ export default class extends GenerateBlueprintBaseGenerator {
           );
           const customGenerator = !lookupGeneratorsNamespaces().includes(generator);
           const jhipsterGenerator = customGenerator || subGeneratorConfig.sbs ? 'base-application' : generator;
+          const generatorClass = upperFirst(camelCase(jhipsterGenerator));
           const subTemplateData = {
             ...application,
             application,
             ...defaultSubGeneratorConfig(),
             ...subGeneratorConfig,
             generator,
+            parentGenerator: customGenerator ? generatorClass : generatorClass,
             customGenerator,
             jhipsterGenerator,
             subGenerator: generator,
-            generatorClass: upperFirst(camelCase(jhipsterGenerator)),
+            generatorClass,
             priorities,
           };
           await this.writeFiles<typeof subTemplateData>({

generators/generate-blueprint/templates/generators/generator/generator.ts.jhi.ejs

@@ -25,7 +25,11 @@
   });
 -&>
 <%_ if (!application.dynamic) { _%>
-import <%- upperFirstCamelCaseBaseName %>Generator from '../base-generator.ts';
+  <%_ if (customGenerator) { _%>
+import <%- parentGenerator %>Generator, { type Features, type Options } from '../base-generator.ts';
+  <%_ } else { _%>
+import <%- parentGenerator %>Generator, { type Features, type Options } from 'generator-jhipster/generators/<%- jhipsterGenerator %>';
+  <%_ } _%>
 <%_ } _%>
 <%_ if (priorities.find(priority => priority.name === 'initializing')) { _%>
 import command from './command.<%- blueprintMjsExtension %>';
@@ -35,22 +39,22 @@ import command from './command.<%- blueprintMjsExtension %>';
 // eslint-disable-next-line import/prefer-default-export
 export async function createGenerator(env) {
   /** @type {typeof import('generator-jhipster/generators/<%- jhipsterGenerator %>').default} */
-  let <%- generatorClass %>Generator;
+  let <%- parentGenerator %>Generator;
   try {
     // Try to use locally installed generator-jhipster
-    <%- generatorClass %>Generator = (await import('generator-jhipster/generators/<%- jhipsterGenerator %>')).default;
+    <%- parentGenerator %>Generator = (await import('generator-jhipster/generators/<%- jhipsterGenerator %>')).default;
   } catch {
     // Fallback to the currently running jhipster.
     const jhipsterGenerator = 'jhipster:<%- generator %>';
-    <%- generatorClass %>Generator = await env.requireGenerator(jhipsterGenerator);
+    <%- parentGenerator %>Generator = await env.requireGenerator(jhipsterGenerator);
   }
 
-  return class extends <%- generatorClass %>Generator {
+  return class extends <%- parentGenerator %>Generator {
 <%_ } else { _%>
-export default class extends <%- upperFirstCamelCaseBaseName %>Generator {
+export default class extends <%- parentGenerator %>Generator {
 <%_ } _%>
 <%_ if (sbs || !customGenerator) { -%>
-  constructor(args, opts, features) {
+  constructor(args?: string[], opts?: Options, features?: Features) {
     super(args, opts, { ...features,
   <%_ if (sbs) { -%>
       sbsBlueprint: true,
@@ -73,7 +77,7 @@ export default class extends <%- upperFirstCamelCaseBaseName %>Generator {
 <&- fragments.<%- priority.name %>Section() -&>
 <& if (!fragments.<%- priority.name %>Section()) { -&>
 
-  get [<%- application.dynamic ? generatorClass : upperFirstCamelCaseBaseName %>Generator.<%- priority.constant %>]() {
+  get [<%- parentGenerator %>Generator.<%- priority.constant %>]() {
     return this.<%- priority.asTaskGroup %>({
   <%_ if (!sbs && !customGenerator) { _%>
       ...super.<%- priority.name %>,