generator-jhipster 7.7.0 → 7.9.0

package/generators/gae/index.js

@@ -789,7 +789,7 @@ module.exports = class extends BaseBlueprintGenerator {
       addDependencies() {
         if (this.abort) return;
         if (this.buildTool === MAVEN) {
-          this.addMavenDependency('org.springframework.boot.experimental', 'spring-boot-thin-layout', '1.0.23.RELEASE');
+          this.addMavenDependency('org.springframework.boot.experimental', 'spring-boot-thin-layout', '1.0.28.RELEASE');
         }
         if (this.gaeCloudSQLInstanceNeeded === 'N') return;
         if (this.prodDatabaseType === MYSQL || this.prodDatabaseType === MARIADB) {

package/generators/generate-blueprint/constants.mjs

@@ -25,6 +25,7 @@ const prioritiesForSub = subGenerator => (subGenerator.startsWith('entit') ? ENT
 
 export const GENERATORS = 'generators';
 export const SUB_GENERATORS = 'subGenerators';
+export const ADDITIONAL_SUB_GENERATORS = 'additionalSubGenerators';
 export const DYNAMIC = 'dynamic';
 export const JS = 'js';
 
@@ -43,6 +44,11 @@ export const options = () => ({
     type: Array,
     scope: 'storage',
   },
+  [ADDITIONAL_SUB_GENERATORS]: {
+    desc: 'Comma separated additional sub generators to generate',
+    type: String,
+    scope: 'storage',
+  },
   [DYNAMIC]: {
     desc: 'Genate dynamic generators (advanced)',
     type: Boolean,
@@ -73,6 +79,7 @@ export const defaultConfig = () => ({
   [DYNAMIC]: false,
   [JS]: false,
   [SUB_GENERATORS]: [],
+  [ADDITIONAL_SUB_GENERATORS]: '',
 });
 
 export const defaultSubGeneratorConfig = () => ({
@@ -91,6 +98,7 @@ const allSubGeneratorConfig = subGenerator => ({
 export const allGeneratorsConfig = () => ({
   ...requiredConfig,
   [SUB_GENERATORS]: Object.values(GENERATOR_LIST),
+  [ADDITIONAL_SUB_GENERATORS]: '',
   [DYNAMIC]: false,
   [JS]: false,
   [GENERATORS]: Object.fromEntries(
@@ -110,6 +118,17 @@ export const prompts = () => {
       pageSize: 30,
       loop: false,
     },
+    {
+      type: 'input',
+      name: ADDITIONAL_SUB_GENERATORS,
+      message: 'Comma separated additional sub-generators.',
+      validate: input => {
+        if (input) {
+          return /^([\w,-]*)$/.test(input) ? true : 'Please provide valid generator names';
+        }
+        return true;
+      },
+    },
     {
       type: 'confirm',
       name: 'cli',
@@ -119,11 +138,12 @@ export const prompts = () => {
   ];
 };
 
-export const subGeneratorPrompts = subGenerator => {
+export const subGeneratorPrompts = (subGenerator, additionalSubGenerator) => {
   return [
     {
       type: 'confirm',
       name: SBS,
+      when: !additionalSubGenerator,
       message: `Is ${chalk.yellow(subGenerator)} generator a side-by-side blueprint?`,
       default: true,
     },
@@ -139,7 +159,7 @@ export const subGeneratorPrompts = subGenerator => {
       message: `What task do you want do implement at ${chalk.yellow(subGenerator)} generator?`,
       choices: prioritiesForSub(subGenerator),
       pageSize: 30,
-      default: answers => (answers.sbs ? [] : prioritiesForSub(subGenerator)),
+      default: answers => (answers.sbs || additionalSubGenerator ? [] : prioritiesForSub(subGenerator)),
       loop: false,
     },
   ];

package/generators/generate-blueprint/generator.mjs

@@ -21,6 +21,7 @@ import lodash from 'lodash';
 import { readFile } from 'fs/promises';
 
 import BaseBlueprintGenerator from '../generator-base-blueprint.js';
+import { SKIP_COMMIT_HOOK } from '../init/constants.cjs';
 import {
   PRIORITY_PREFIX,
   INITIALIZING_PRIORITY,
@@ -45,6 +46,7 @@ import {
   GENERATORS,
   PRIORITIES,
   SUB_GENERATORS,
+  ADDITIONAL_SUB_GENERATORS,
   WRITTEN,
 } from './constants.mjs';
 
@@ -73,6 +75,9 @@ export default class extends BaseBlueprintGenerator {
     if (this.options.defaults) {
       this.config.defaults(defaultConfig());
     }
+    this.config.defaults({
+      [SKIP_COMMIT_HOOK]: true,
+    });
   }
 
   /** @inheritdoc */
@@ -120,6 +125,16 @@ export default class extends BaseBlueprintGenerator {
           await this.prompt(subGeneratorPrompts(subGenerator), subGeneratorStorage);
         }
       },
+      async eachAdditionalSubGenerator() {
+        const additionalSubGenerators = this.config.get(ADDITIONAL_SUB_GENERATORS) || '';
+        for (const subGenerator of additionalSubGenerators
+          .split(',')
+          .map(sub => sub.trim())
+          .filter(Boolean)) {
+          const subGeneratorStorage = this.getSubGeneratorStorage(subGenerator);
+          await this.prompt(subGeneratorPrompts(subGenerator, true), subGeneratorStorage);
+        }
+      },
     };
   }
 
@@ -161,7 +176,8 @@ export default class extends BaseBlueprintGenerator {
     return {
       prepareCommands() {
         this.application.commands = [];
-        for (const generator of this.application[SUB_GENERATORS]) {
+        if (!this.application[GENERATORS]) return;
+        for (const generator of Object.keys(this.application[GENERATORS])) {
           const subGeneratorConfig = this.getSubGeneratorStorage(generator).getAll();
           if (subGeneratorConfig.command) {
             this.application.commands.push(generator);
@@ -184,8 +200,10 @@ export default class extends BaseBlueprintGenerator {
           sections: files,
           context: this.application,
         });
-        // function to use directly template
-        for (const generator of this.jhipsterConfig[SUB_GENERATORS] || []) {
+      },
+      async writingGenerators() {
+        if (!this.application[GENERATORS]) return;
+        for (const generator of Object.keys(this.application[GENERATORS])) {
           const subGeneratorStorage = this.getSubGeneratorStorage(generator);
           const subGeneratorConfig = subGeneratorStorage.getAll();
           const priorities = (subGeneratorConfig[PRIORITIES] || []).map(priority => ({
@@ -199,6 +217,7 @@ export default class extends BaseBlueprintGenerator {
             ...defaultSubGeneratorConfig(),
             ...subGeneratorConfig,
             generator,
+            customGenerator,
             jhipsterGenerator,
             subGenerator: generator,
             generatorClass: upperFirst(camelCase(jhipsterGenerator)),
@@ -234,8 +253,8 @@ export default class extends BaseBlueprintGenerator {
             lint: 'eslint .',
             'lint-fix': 'npm run ejslint && npm run lint -- --fix',
             mocha: 'mocha generators --no-insight --forbid-only',
-            'prettier-format': 'prettier --write "{,**/}*.{js,cjs,mjs,json,md,yml}"',
-            pretest: 'npm run lint',
+            'prettier-format': 'prettier --write "{,**/}*.{md,json,yml,html,js,cjs,mjs,ts,tsx,css,scss,vue,java}"',
+            pretest: 'npm run prettier-check && npm run lint',
             test: 'npm run mocha --',
             'update-snapshot': 'npm run mocha -- --no-parallel --updateSnapshot',
           },
@@ -331,7 +350,7 @@ To begin to work:
 - launch: ${chalk.yellow.bold('npm install')}
 - link: ${chalk.yellow.bold('npm link')}
 - link JHipster: ${chalk.yellow.bold('npm link generator-jhipster')}
-- test your module in a JHipster project: 
+- test your module in a JHipster project:
     - create a new directory and go into it
     - link the blueprint: ${chalk.yellow.bold(`npm link generator-jhipster-${this.moduleName}`)}
     - launch JHipster with flags: ${chalk.yellow.bold(`jhipster --blueprints ${this.moduleName}`)}

package/generators/generate-blueprint/templates/.github/workflows/generator.yml.ejs

@@ -18,15 +18,17 @@
 -%>
 name: Generator
 on: [push, pull_request]
+permissions:
+  contents: read
 jobs:
   <%= baseName %>:
     name: npm-test
     runs-on: ubuntu-20.04
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 16
       - run: npm ci
       - run: npm run test

package/generators/generate-blueprint/templates/cli/commands.cjs.ejs

@@ -19,7 +19,8 @@
 module.exports = {
 <% for (const command of commands) { %>
   '<%= command %>': {
-    desc: 'Run <%= command %>',
+    desc: 'Run <%= command %> sub-generator (<%= baseName %> blueprint)',
+    blueprint: 'generator-jhipster-<%= baseName %>',
   },
 <% } %>
 };

package/generators/generate-blueprint/templates/generators/generator/generator.mjs.jhi.ejs

@@ -35,7 +35,6 @@ import {
 } from 'generator-jhipster/esm/priorities';
 <%_ } _%>
 
-
 <%_ if (application.dynamic) { _%>
 // eslint-disable-next-line import/prefer-default-export
 export async function createGenerator(env) {
@@ -57,13 +56,15 @@ export default class extends <%= generatorClass %>Generator {
     super(args, opts, { taskPrefix: PRIORITY_PREFIX, ...features });
 
     if (this.options.help) return;
+<%_ if (!customGenerator) { _%>
 
     if (!this.options.jhipsterContext) {
       throw new Error(`This is a JHipster blueprint and should be used only like ${chalk.yellow('jhipster --blueprints <%= application.baseName %>')}`);
     }
-<%_ if (sbs) { _%>
+  <%_ if (sbs) { _%>
 
     this.sbsBlueprint = true
+  <%_ } _%>
 <%_ } _%>
   }
 
@@ -73,6 +74,9 @@ export default class extends <%= generatorClass %>Generator {
 
   get [<%= priority.constant %>]() {
     return {
+  <%_ if (!sbs) { _%>
+      ...super._<%= priority.name %>(),
+  <%_ } _%>
       async <%= priority.name %>TemplateTask() {
   <%_ if (priority.name == 'writing') { %>
         await this.writeFiles({
@@ -85,9 +89,6 @@ export default class extends <%= generatorClass %>Generator {
         });
   <%_ } %>
       },
-  <%_ if (!sbs) { _%>
-      ...super._<%= priority.name %>(),
-  <%_ } _%>
     };
   }
 <& } -&>

package/generators/generate-blueprint/templates/generators/generator/generator.spec.mjs.ejs

@@ -20,16 +20,25 @@ import expect from 'expect';
 
 import { helpers, lookups } from '#test-utils';
 
+const SUB_GENERATOR = '<%= subGenerator %>';
+<%_ if (customGenerator) { _%>
+const SUB_GENERATOR_NAMESPACE = `jhipster-<%= application.baseName %>:${SUB_GENERATOR}`;
+<%_ } else { _%>
+const BLUEPRINT_NAMESPACE = `jhipster:${SUB_GENERATOR}`;
+<%_ } _%>
+
 describe('SubGenerator <%= subGenerator %> of <%= application.baseName %> JHipster blueprint', () => {
   describe('run', () => {
     let result;
     before(async function() {
       result = await helpers
-        .create('jhipster:<%= subGenerator %>')
+        .create(<%= customGenerator ? 'SUB_GENERATOR_NAMESPACE' : 'BLUEPRINT_NAMESPACE' %>)
         .withOptions({
           reproducible: true,
           defaults: true,
+<%_ if (!customGenerator) { _%>
           blueprint: '<%= application.baseName %>',
+<%_ } _%>
         })
         .withLookups(lookups)
         .run();

package/generators/generator-base-blueprint.js

@@ -383,6 +383,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
   _isPriorityMissing(priorityName, destPriority = 'related') {
     const ownPrototype = Object.getPrototypeOf(this);
     const parentPrototype = Object.getPrototypeOf(ownPrototype);
+    priorityName = `${this.features.taskPrefix || ''}${priorityName}`;
     if (
       parentPrototype !== JHipsterBaseBlueprintGenerator.prototype &&
       !Object.getOwnPropertyDescriptor(ownPrototype, priorityName) &&
@@ -482,7 +483,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
    * Compose external blueprint module
    * @param {string} blueprint - name of the blueprint
    * @param {string} subGen - sub generator
-   * @param {any} options - options to pass to blueprint generator
+   * @param {any} [extraOptions] - options to pass to blueprint generator
    * @return {Generator|undefined}
    */
   async _composeBlueprint(blueprint, subGen, extraOptions = {}) {
@@ -534,7 +535,11 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
       this.warning(`Could not retrieve packagePath of blueprint '${blueprintPkgName}'`);
       return undefined;
     }
-    return JSON.parse(fs.readFileSync(path.join(blueprintPackagePath, 'package.json')));
+    const packageJsonFile = path.join(blueprintPackagePath, 'package.json');
+    if (!fs.existsSync(packageJsonFile)) {
+      return undefined;
+    }
+    return JSON.parse(fs.readFileSync(packageJsonFile));
   }
 
   /**
@@ -561,13 +566,7 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     if (blueprint === 'generator-jhipster') {
       this.error(`You cannot use ${chalk.yellow(blueprint)} as the blueprint.`);
     }
-    if (!this._findBlueprintPackageJson(blueprint)) {
-      this.error(
-        `The ${chalk.yellow(blueprint)} blueprint provided is not installed. Please install it using command ${chalk.yellow(
-          `npm i -g ${blueprint}`
-        )}.`
-      );
-    }
+    this._findBlueprintPackageJson(blueprint);
   }
 
   /**
@@ -583,19 +582,19 @@ module.exports = class JHipsterBaseBlueprintGenerator extends BaseGenerator {
     }
     const mainGeneratorJhipsterVersion = packagejs.version;
     const blueprintJhipsterVersion = blueprintPackageJson.dependencies && blueprintPackageJson.dependencies['generator-jhipster'];
-    if (blueprintJhipsterVersion && !semver.valid(blueprintJhipsterVersion) && !semver.validRange(blueprintJhipsterVersion)) {
-      this.info(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
-      return;
-    }
     if (blueprintJhipsterVersion) {
-      if (mainGeneratorJhipsterVersion !== blueprintJhipsterVersion) {
-        this.error(
-          `The installed ${chalk.yellow(
-            blueprintPkgName
-          )} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`
-        );
+      if (!semver.valid(blueprintJhipsterVersion) && !semver.validRange(blueprintJhipsterVersion)) {
+        this.info(`Blueprint ${blueprintPkgName} contains generator-jhipster dependency with non comparable version`);
+        return;
       }
-      return;
+      if (semver.satisfies(mainGeneratorJhipsterVersion, blueprintJhipsterVersion)) {
+        return;
+      }
+      throw new Error(
+        `The installed ${chalk.yellow(
+          blueprintPkgName
+        )} blueprint targets JHipster v${blueprintJhipsterVersion} and is not compatible with this JHipster version. Either update the blueprint or JHipster. You can also disable this check using --skip-checks at your own risk`
+      );
     }
     const blueprintPeerJhipsterVersion =
       blueprintPackageJson.peerDependencies && blueprintPackageJson.peerDependencies['generator-jhipster'];