generator-jhipster 8.0.0-beta.3 → 8.0.0

package/dist/generators/base-workspaces/internal/docker-base.mjs

@@ -57,7 +57,7 @@ export function checkImages() {
  */
 export function generateJwtSecret() {
     if (this.jwtSecretKey === undefined) {
-        this.jwtSecretKey = createBase64Secret(this.options.reproducibleTests);
+        this.jwtSecretKey = this.jhipsterConfig.jwtSecretKey = createBase64Secret(this.options.reproducibleTests);
     }
 }
 /**
@@ -123,25 +123,16 @@ export function loadFromYoRc() {
     this.usePulsar = false;
     this.useMemcached = false;
     this.useRedis = false;
-    // Current implementation loads appsFolders into defaultAppsFolders
-    this.defaultAppsFolders = this.appsFolders;
-    delete this.appsFolders;
-    if (this.defaultAppsFolders !== undefined) {
-        this.log.log('\nFound .yo-rc.json config file...');
+    loadConfigs.call(this);
+    if (this.microserviceNb > 0 || this.gatewayNb > 0) {
+        this.deploymentApplicationType = MICROSERVICE;
     }
-    if (this.regenerate) {
-        this.appsFolders = this.defaultAppsFolders;
-        loadConfigs.call(this);
-        if (this.microserviceNb > 0 || this.gatewayNb > 0) {
-            this.deploymentApplicationType = MICROSERVICE;
-        }
-        else {
-            this.deploymentApplicationType = MONOLITH;
-        }
-        setClusteredApps.call(this);
-        if (!this.adminPassword) {
-            this.adminPassword = 'admin'; // TODO find a better way to do this
-            this.adminPasswordBase64 = convertSecretToBase64(this.adminPassword);
-        }
+    else {
+        this.deploymentApplicationType = MONOLITH;
+    }
+    setClusteredApps.call(this);
+    if (!this.adminPassword) {
+        this.adminPassword = 'admin'; // TODO find a better way to do this
+        this.adminPasswordBase64 = convertSecretToBase64(this.adminPassword);
     }
 }

package/dist/generators/base-workspaces/internal/docker-prompts.mjs

@@ -17,7 +17,8 @@
  * limitations under the License.
  */
 import chalk from 'chalk';
-import shelljs from 'shelljs';
+import { readFileSync, readdirSync, statSync } from 'node:fs';
+import { join } from 'node:path';
 import { loadConfigs } from './docker-base.mjs';
 import { applicationTypes, monitoringTypes, serviceDiscoveryTypes } from '../../../jdl/jhipster/index.mjs';
 import { convertSecretToBase64 } from '../../base/support/index.mjs';
@@ -25,8 +26,7 @@ const { MICROSERVICE, MONOLITH, GATEWAY } = applicationTypes;
 const { PROMETHEUS } = monitoringTypes;
 const monitoring = monitoringTypes;
 const NO_MONITORING = monitoring.NO;
-const { CONSUL, EUREKA } = serviceDiscoveryTypes;
-const NO_SERVICE_DISCOVERY = serviceDiscoveryTypes.NO;
+const { CONSUL, EUREKA, NO: NO_SERVICE_DISCOVERY } = serviceDiscoveryTypes;
 export default {
     askForApplicationType,
     askForGatewayType,
@@ -44,7 +44,7 @@ export default {
  * Ask For Application Type
  */
 async function askForApplicationType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -71,7 +71,7 @@ async function askForApplicationType() {
  * Ask For Gateway Type
  */
 async function askForGatewayType() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     if (this.deploymentApplicationType !== MICROSERVICE)
         return;
@@ -96,7 +96,7 @@ async function askForGatewayType() {
  * Ask For Path
  */
 async function askForPath() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const deploymentApplicationType = this.deploymentApplicationType;
     let messageAskForPath;
@@ -112,14 +112,21 @@ async function askForPath() {
             name: 'directoryPath',
             message: messageAskForPath,
             default: this.directoryPath || '../',
-            validate: input => {
+            validate: async (input) => {
                 const path = this.destinationPath(input);
-                if (shelljs.test('-d', path)) {
-                    const appsFolders = getAppFolders.call(this, input, deploymentApplicationType);
-                    if (appsFolders.length === 0) {
-                        return deploymentApplicationType === MONOLITH ? `No monolith found in ${path}` : `No microservice or gateway found in ${path}`;
+                try {
+                    if (statSync(path).isDirectory) {
+                        const appsFolders = getAppFolders.call(this, path, deploymentApplicationType);
+                        if (appsFolders.length === 0) {
+                            return deploymentApplicationType === MONOLITH
+                                ? `No monolith found in ${path}`
+                                : `No microservice or gateway found in ${path}`;
+                        }
+                        return true;
                     }
-                    return true;
+                }
+                catch {
+                    // Ignore error
                 }
                 return `${path} is not a directory or doesn't exist`;
             },
@@ -132,7 +139,7 @@ async function askForPath() {
         this.log.log(chalk.yellow(`The path "${this.directoryPath}" does not end with a trailing "/", adding it anyway.`));
         this.directoryPath += '/';
     }
-    this.appsFolders = getAppFolders.call(this, this.directoryPath, deploymentApplicationType);
+    this.appsFolders = getAppFolders.call(this, this.destinationPath(this.directoryPath), deploymentApplicationType);
     // Removing registry from appsFolders, using reverse for loop
     for (let i = this.appsFolders.length - 1; i >= 0; i--) {
         if (this.appsFolders[i] === 'jhipster-registry' || this.appsFolders[i] === 'registry') {
@@ -145,7 +152,7 @@ async function askForPath() {
  * Ask For Apps
  */
 async function askForApps() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const messageAskForApps = 'Which applications do you want to include in your configuration?';
     const prompts = [
@@ -154,7 +161,7 @@ async function askForApps() {
             name: 'chosenApps',
             message: messageAskForApps,
             choices: this.appsFolders ?? [],
-            default: this.defaultAppsFolders,
+            default: this.jhipsterConfig.appsFolders,
             validate: input => (input.length === 0 ? 'Please choose at least one application' : true),
         },
     ];
@@ -166,7 +173,7 @@ async function askForApps() {
  * Ask For Clusters Mode
  */
 async function askForClustersMode() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const clusteredDbApps = [];
     this.appConfigs.forEach((appConfig, index) => {
@@ -192,7 +199,7 @@ async function askForClustersMode() {
  * Ask For Monitoring
  */
 async function askForMonitoring() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -219,7 +226,7 @@ async function askForMonitoring() {
  * Ask For Service Discovery
  */
 async function askForServiceDiscovery() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const serviceDiscoveryEnabledApps = [];
     this.appConfigs.forEach(appConfig => {
@@ -231,15 +238,15 @@ async function askForServiceDiscovery() {
         }
     });
     if (serviceDiscoveryEnabledApps.length === 0) {
-        this.serviceDiscoveryType = false;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = NO_SERVICE_DISCOVERY;
         return;
     }
     if (serviceDiscoveryEnabledApps.every(app => app.serviceDiscoveryType === CONSUL)) {
-        this.serviceDiscoveryType = CONSUL;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = CONSUL;
         this.log.log(chalk.green('Consul detected as the service discovery and configuration provider used by your apps'));
     }
     else if (serviceDiscoveryEnabledApps.every(app => app.serviceDiscoveryType === EUREKA)) {
-        this.serviceDiscoveryType = EUREKA;
+        this.serviceDiscoveryType = this.jhipsterConfig.serviceDiscoveryType = EUREKA;
         this.log.log(chalk.green('JHipster registry detected as the service discovery and configuration provider used by your apps'));
     }
     else {
@@ -278,7 +285,9 @@ async function askForServiceDiscovery() {
  * Ask For Admin Password
  */
 async function askForAdminPassword() {
-    if (this.regenerate || this.serviceDiscoveryType !== EUREKA)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
+        return;
+    if (this.serviceDiscoveryType !== EUREKA)
         return;
     const prompts = [
         {
@@ -297,7 +306,7 @@ async function askForAdminPassword() {
  * Ask For Docker Repository Name
  */
 async function askForDockerRepositoryName() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -314,7 +323,7 @@ async function askForDockerRepositoryName() {
  * Ask For Docker Push Command
  */
 async function askForDockerPushCommand() {
-    if (this.regenerate)
+    if (!this.options.askAnswered && (this.regenerate || this.config.existed))
         return;
     const prompts = [
         {
@@ -333,28 +342,33 @@ async function askForDockerPushCommand() {
  * @param deploymentApplicationType type of application being composed
  * @returns {Array} array of string representing app folders
  */
-export function getAppFolders(input, deploymentApplicationType) {
-    const destinationPath = this.destinationPath(input);
-    const files = shelljs.ls('-l', destinationPath);
+export function getAppFolders(directory, deploymentApplicationType) {
+    const files = readdirSync(directory);
     const appsFolders = [];
     files.forEach(file => {
-        if (file.isDirectory()) {
-            if (shelljs.test('-f', `${destinationPath}/${file.name}/.yo-rc.json`)) {
-                try {
-                    const fileData = this.fs.readJSON(`${destinationPath}/${file.name}/.yo-rc.json`);
-                    if (fileData['generator-jhipster'].baseName !== undefined &&
-                        (deploymentApplicationType === undefined ||
-                            deploymentApplicationType === fileData['generator-jhipster'].applicationType ||
-                            (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))) {
-                        appsFolders.push(file.name.match(/([^/]*)\/*$/)[1]);
+        try {
+            if (statSync(join(directory, file)).isDirectory()) {
+                const yoRcFile = join(directory, file, '.yo-rc.json');
+                if (statSync(yoRcFile).isFile()) {
+                    try {
+                        const fileData = JSON.parse(readFileSync(yoRcFile).toString());
+                        if (fileData['generator-jhipster'].baseName !== undefined &&
+                            (deploymentApplicationType === undefined ||
+                                deploymentApplicationType === (fileData['generator-jhipster'].applicationType ?? MONOLITH) ||
+                                (deploymentApplicationType === MICROSERVICE && fileData['generator-jhipster'].applicationType === GATEWAY))) {
+                            appsFolders.push(file.match(/([^/]*)\/*$/)[1]);
+                        }
+                    }
+                    catch (err) {
+                        this.log.error(chalk.red(`${yoRcFile}: this .yo-rc.json can't be read`));
+                        this.log.debug('Error:', err);
                     }
-                }
-                catch (err) {
-                    this.log.error(chalk.red(`${file}: this .yo-rc.json can't be read`));
-                    this.log.debug('Error:', err);
                 }
             }
         }
+        catch {
+            // Not a file or directory
+        }
     });
     return appsFolders;
 }

package/dist/generators/bootstrap/generator.mjs

@@ -17,17 +17,17 @@
  * limitations under the License.
  */
 import { forceYoFiles, createConflicterTransform, createYoResolveTransform } from '@yeoman/conflicter';
-import { isFilePending } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
+import { createCommitTransform } from 'mem-fs-editor/transform';
 import BaseGenerator from '../base/index.mjs';
-import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFile, createSortConfigFilesTransform, createESLintTransform, } from './support/index.mjs';
+import { createMultiStepTransform, createPrettierTransform, createForceWriteConfigFilesTransform, autoCrlfTransform, isPrettierConfigFilePath, createSortConfigFilesTransform, createESLintTransform, createRemoveUnusedImportsTransform, } from './support/index.mjs';
 import { PRETTIER_EXTENSIONS } from '../generator-constants.mjs';
-import { GENERATOR_UPGRADE } from '../generator-list.mjs';
+import { GENERATOR_BOOTSTRAP, GENERATOR_UPGRADE } from '../generator-list.mjs';
 import { PRIORITY_NAMES, QUEUES } from '../base-application/priorities.mjs';
 import command from './command.mjs';
-import { createRemoveUnusedImportsTransform } from './support/java-unused-imports-transform.mjs';
 import { loadStoredAppOptions } from '../app/support/index.mjs';
 const { MULTISTEP_TRANSFORM, PRE_CONFLICTS } = PRIORITY_NAMES;
-const { MULTISTEP_TRANSFORM_QUEUE } = QUEUES;
+const { MULTISTEP_TRANSFORM_QUEUE, PRE_CONFLICTS_QUEUE } = QUEUES;
 const MULTISTEP_TRANSFORM_PRIORITY = BaseGenerator.asPriority(MULTISTEP_TRANSFORM);
 const PRE_CONFLICTS_PRIORITY = BaseGenerator.asPriority(PRE_CONFLICTS);
 export default class BootstrapGenerator extends BaseGenerator {
@@ -35,14 +35,22 @@ export default class BootstrapGenerator extends BaseGenerator {
     static PRE_CONFLICTS = PRE_CONFLICTS_PRIORITY;
     upgradeCommand;
     skipPrettier;
+    prettierExtensions = PRETTIER_EXTENSIONS.split(',');
+    prettierOptions = { plugins: [] };
     constructor(args, options, features) {
         super(args, options, { jhipsterBootstrap: false, uniqueGlobally: true, customCommitTask: () => this.commitSharedFs(), ...features });
     }
-    beforeQueue() {
+    async beforeQueue() {
         loadStoredAppOptions.call(this);
         // Force npm override later if needed
         this.env.options.nodePackageManager = 'npm';
         this.upgradeCommand = this.options.commandName === GENERATOR_UPGRADE;
+        if (!this.fromBlueprint) {
+            await this.composeWithBlueprints(GENERATOR_BOOTSTRAP);
+        }
+        if (this.delegateToBlueprint) {
+            throw new Error('Only sbs blueprint is supported');
+        }
     }
     get initializing() {
         return this.asInitializingTaskGroup({
@@ -64,7 +72,7 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     get multistepTransform() {
         return {
-            queueTransform() {
+            queueMultistepTransform() {
                 this.queueMultistepTransform();
             },
         };
@@ -74,9 +82,8 @@ export default class BootstrapGenerator extends BaseGenerator {
     }
     get preConflicts() {
         return {
-            async commitPrettierConfig() {
-                const filter = file => isFilePending(file) && isPrettierConfigFile(file);
-                await this.commitSharedFs(this.env.sharedFs.stream({ filter }));
+            queueCommitPrettierConfig() {
+                this.queueCommitPrettierConfig();
             },
         };
     }
@@ -87,56 +94,90 @@ export default class BootstrapGenerator extends BaseGenerator {
      * Queue multi step templates transform
      */
     queueMultistepTransform() {
+        const multiStepTransform = createMultiStepTransform();
+        const listener = filePath => {
+            if (multiStepTransform.templateFileFs.isTemplate(filePath)) {
+                this.env.sharedFs.removeListener('change', listener);
+                this.queueMultistepTransform();
+            }
+        };
         this.queueTask({
-            method: () => {
-                const multiStepTransform = createMultiStepTransform();
-                const filter = file => isFilePending(file) && multiStepTransform.templateFileFs.isTemplate(file.path);
-                return this.env.applyTransforms([multiStepTransform], {
+            method: async () => {
+                await this.pipeline({
                     name: 'applying multi-step templates',
-                    streamOptions: { filter },
-                });
+                    filter: file => isFileStateModified(file) && multiStepTransform.templateFileFs.isTemplate(file.path),
+                    refresh: true,
+                    allowOverride: true,
+                }, multiStepTransform);
+                this.env.sharedFs.on('change', listener);
             },
             taskName: MULTISTEP_TRANSFORM_QUEUE,
             queueName: MULTISTEP_TRANSFORM_QUEUE,
             once: true,
         });
-        const onChangeListener = file => {
-            if (createMultiStepTransform().templateFileFs.isTemplate(file)) {
-                this.queueMultistepTransform();
-            }
-            else {
-                this.env.sharedFs.once('change', onChangeListener);
+    }
+    queueCommitPrettierConfig() {
+        const listener = filePath => {
+            if (isPrettierConfigFilePath(filePath)) {
+                this.env.sharedFs.removeListener('change', listener);
+                this.queueCommitPrettierConfig();
             }
         };
-        this.env.sharedFs.once('change', onChangeListener);
+        this.queueTask({
+            method: async () => {
+                await this.commitPrettierConfig();
+                this.env.sharedFs.on('change', listener);
+            },
+            taskName: 'commitPrettierConfig',
+            queueName: PRE_CONFLICTS_QUEUE,
+            once: true,
+        });
+    }
+    async commitPrettierConfig() {
+        await this.commitSharedFs({
+            log: 'prettier configuration files commited to disk',
+            filter: file => isPrettierConfigFilePath(file.path),
+        });
     }
     /**
      * Commits the MemFs to the disc.
-     * @param stream - files stream, defaults to this.sharedFs.stream().
      */
-    async commitSharedFs(stream = this.env.sharedFs.stream({ filter: isFilePending })) {
-        const { skipYoResolve } = this.options;
-        const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
+    async commitSharedFs({ log, ...options } = {}) {
+        const skipYoResolveTransforms = [];
+        if (this.options.skipYoResolve) {
+            skipYoResolveTransforms.push(createYoResolveTransform());
+        }
+        const prettierTransforms = [];
+        if (!this.skipPrettier) {
+            const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
+            prettierTransforms.push(createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js' }), createRemoveUnusedImportsTransform.call(this, { ignoreErrors }), await createPrettierTransform.call(this, {
+                ignoreErrors,
+                prettierPackageJson: true,
+                prettierJava: !this.jhipsterConfig.skipServer,
+                extensions: this.prettierExtensions.join(','),
+                prettierOptions: this.prettierOptions,
+            }));
+        }
+        const autoCrlfTransforms = [];
+        if (this.jhipsterConfig.autoCrlf) {
+            autoCrlfTransforms.push(await autoCrlfTransform({ baseDir: this.destinationPath() }));
+        }
         const transformStreams = [
-            ...(skipYoResolve ? [] : [createYoResolveTransform()]),
+            ...skipYoResolveTransforms,
             forceYoFiles(),
             createSortConfigFilesTransform(),
             createForceWriteConfigFilesTransform(),
-            ...(this.skipPrettier
-                ? []
-                : [
-                    createESLintTransform.call(this, { ignoreErrors, extensions: 'ts,js' }),
-                    createRemoveUnusedImportsTransform.call(this, { ignoreErrors }),
-                    await createPrettierTransform.call(this, {
-                        ignoreErrors,
-                        prettierPackageJson: true,
-                        prettierJava: !this.jhipsterConfig.skipServer,
-                        extensions: PRETTIER_EXTENSIONS,
-                    }),
-                ]),
-            ...(this.jhipsterConfig.autoCrlf ? [autoCrlfTransform(this.createGit())] : []),
-            createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions, memFs: this.env.sharedFs }),
+            ...prettierTransforms,
+            ...autoCrlfTransforms,
+            createConflicterTransform(this.env.adapter, { ...this.env.conflicterOptions }),
+            createCommitTransform(),
         ];
-        await this.fs.commit(transformStreams, stream);
+        // Disable progress since it blocks stdin.
+        await this.pipeline({
+            refresh: false,
+            ...options,
+            disabled: true,
+        }, ...transformStreams);
+        this.log.ok(log ?? 'files commited to disk');
     }
 }

package/dist/generators/bootstrap/support/auto-crlf-transform.mjs

@@ -18,8 +18,11 @@
  */
 import { stat } from 'fs/promises';
 import { createReadStream } from 'fs';
+import { relative } from 'path';
 import { transform } from 'p-transform';
 import { isBinaryFile } from 'isbinaryfile';
+import { simpleGit } from 'simple-git';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import { normalizeLineEndings } from '../../base/support/index.mjs';
 /**
  * Detect the file first line endings
@@ -44,27 +47,37 @@ export function detectCrLf(filePath) {
         });
     });
 }
-const autoCrlfTransform = (git) => transform(async (file) => {
-    if (!file.contents) {
-        return file;
-    }
-    if (await isBinaryFile(file.contents)) {
-        return file;
-    }
-    const fstat = await stat(file.path);
-    if (!fstat.isFile()) {
-        return file;
+const autoCrlfTransform = async ({ baseDir }) => {
+    const git = simpleGit({ baseDir }).env({
+        ...process.env,
+        LANG: 'en',
+    });
+    if (!(await git.checkIsRepo())) {
+        throw new Error(`${baseDir} is not inside a git repository`);
     }
-    const attributes = Object.fromEntries((await git.raw('check-attr', 'binary', 'eol', '--', file.path))
-        .split(/\r\n|\r|\n/)
-        .map(attr => attr.split(':'))
-        .map(([_file, attr, value]) => [attr, value]));
-    if (attributes.binary === 'set' || attributes.eol === 'lf') {
+    return transform(async (file) => {
+        if (!isFileStateModified(file) || !file.path.startsWith(baseDir)) {
+            return file;
+        }
+        try {
+            const fstat = await stat(file.path);
+            if (fstat.isFile()) {
+                if (await isBinaryFile(file.contents)) {
+                    return file;
+                }
+                const attrs = Object.fromEntries((await git.raw('check-attr', 'binary', 'eol', '--', relative(baseDir, file.path)))
+                    .split(/\r\n|\r|\n/)
+                    .map(attr => attr.split(':'))
+                    .map(([_file, attr, value]) => [attr, value]));
+                if (attrs.eol === 'crlf' || (attrs.binary !== 'set' && attrs.eol !== 'lf' && (await detectCrLf(file.path)))) {
+                    file.contents = Buffer.from(normalizeLineEndings(file.contents.toString(), '\r\n'));
+                }
+            }
+        }
+        catch {
+            // File doesn't exist.
+        }
         return file;
-    }
-    if (attributes.eol === 'crlf' || (await detectCrLf(file.path))) {
-        file.contents = Buffer.from(normalizeLineEndings(file.contents.toString(), '\r\n'));
-    }
-    return file;
-});
+    });
+};
 export default autoCrlfTransform;

package/dist/generators/bootstrap/support/eslint-transform.mjs

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 import { passthrough } from 'p-transform';
-import { isFileStateDeleted } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import ESLint from 'eslint';
 import { Minimatch } from 'minimatch';
 import { getPackageRoot } from '../../../lib/index.mjs';
@@ -46,12 +46,9 @@ export const createESLintTransform = function (transformOptions = {}) {
         },
     });
     return passthrough(async (file) => {
-        if (!minimatch.match(file.path) || isFileStateDeleted(file)) {
+        if (!minimatch.match(file.path) || !isFileStateModified(file)) {
             return;
         }
-        if (!file.contents) {
-            throw new Error(`File content doesn't exist for ${file.relative}`);
-        }
         try {
             if (await eslint.isPathIgnored(file.path)) {
                 return;

package/dist/generators/bootstrap/support/index.mjs

@@ -19,6 +19,7 @@
 export { default as autoCrlfTransform } from './auto-crlf-transform.mjs';
 export { default as createForceWriteConfigFilesTransform } from './force-write-config-files-transform.mjs';
 export * from './eslint-transform.mjs';
+export * from './java-unused-imports-transform.mjs';
 export * from './multi-step-transform/index.mjs';
 export * from './prettier-support.mjs';
 export { default as createSortConfigFilesTransform } from './sort-config-files-transform.mjs';

package/dist/generators/bootstrap/support/java-unused-imports-transform.mjs

@@ -1,12 +1,12 @@
 import { extname } from 'path';
 import { passthrough } from '@yeoman/transform';
-import { isFileStateDeleted } from 'mem-fs-editor/state';
+import { isFileStateModified } from 'mem-fs-editor/state';
 import { removeUnusedImports } from 'java-lint';
 // eslint-disable-next-line import/prefer-default-export
 export const createRemoveUnusedImportsTransform = function (options = {}) {
     const { ignoreErrors } = options;
     return passthrough((file) => {
-        if (extname(file.path) === '.java' && !isFileStateDeleted(file)) {
+        if (extname(file.path) === '.java' && isFileStateModified(file)) {
             if (file.contents) {
                 try {
                     file.contents = Buffer.from(removeUnusedImports(file.contents.toString('utf8')));

package/dist/generators/bootstrap/support/multi-step-transform/index.mjs

@@ -16,39 +16,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Duplex } from 'stream';
-import PQueue from 'p-queue';
-import { isFilePending } from 'mem-fs-editor/state';
+import { transform } from 'p-transform';
 import TemplateFileFs from './template-file-fs.mjs';
 // eslint-disable-next-line import/prefer-default-export
 export const createMultiStepTransform = () => {
-    const twoStepTemplateQueue = new PQueue({ concurrency: 1, autoStart: false });
     const templateFileFs = new TemplateFileFs({});
-    const pendingFiles = [];
-    const duplex = Duplex.from(async function* (source) {
-        for await (const file of source) {
-            if (file.contents && templateFileFs.isTemplate(file.path)) {
-                const templateFile = templateFileFs.add(file.path, file.contents.toString());
-                if (templateFile.rootTemplate) {
-                    // If multi-step root, postpone.
-                    twoStepTemplateQueue.add(() => {
-                        if (pendingFiles.includes(templateFile.basePath)) {
-                            return;
-                        }
-                        file.path = templateFile.basePath;
-                        file.contents = Buffer.from(templateFile.render().concat('\n'));
-                    });
-                }
-                else {
-                    delete file.state;
-                }
-            }
-            else if (isFilePending(file)) {
-                pendingFiles.push(file.path);
-            }
-            yield file;
+    const templateFiles = [];
+    const duplex = transform((file) => {
+        if (!templateFileFs.isTemplate(file.path)) {
+            throw new Error(`File ${file.path} is not supported`);
+        }
+        const templateFile = templateFileFs.add(file);
+        if (templateFile.rootTemplate) {
+            templateFiles.push(templateFile);
+        }
+        return undefined;
+    }, async function () {
+        for (const templateFile of templateFiles) {
+            const file = templateFile.file;
+            file.path = templateFile.basePath;
+            file.contents = Buffer.from(templateFile.render().concat('\n'));
+            this.push(templateFile.file);
         }
-        await twoStepTemplateQueue.start().onIdle();
     });
     duplex.templateFileFs = templateFileFs;
     return duplex;