optimize tests

generators/base-core/generator-core.spec.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, it, expect as jestExpect } from 'esmocha';
-import { basicHelpers as helpers } from '../../lib/testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 
 import { createJHipsterLogger } from '../base/support/index.js';
 import Base from './index.js';

generators/base/blueprints.spec.ts

@@ -3,7 +3,7 @@ import { mock } from 'node:test';
 import { before, describe, expect, it } from 'esmocha';
 import type { RunResult } from 'yeoman-test';
 
-import { basicHelpers as helpers } from '../../lib/testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { packageJson } from '../../lib/index.js';
 import BaseGenerator from './index.js';
 

generators/bootstrap/command.ts

@@ -26,7 +26,13 @@ const command: JHipsterCommandDefinition = {
       scope: 'storage',
     },
     skipPrettier: {
-      description: 'Skip prettier',
+      description: 'Skip prettier transformation',
+      type: Boolean,
+      hide: true,
+      scope: 'generator',
+    },
+    skipEslint: {
+      description: 'Skip ESlint transformation',
       type: Boolean,
       hide: true,
       scope: 'generator',
@@ -37,6 +43,12 @@ const command: JHipsterCommandDefinition = {
       hide: true,
       scope: 'generator',
     },
+    skipForks: {
+      description: 'Dont use forks',
+      type: Boolean,
+      hide: true,
+      scope: 'generator',
+    },
   },
 };
 

generators/bootstrap/generator.ts

@@ -54,6 +54,8 @@ export default class BootstrapGenerator extends BaseGenerator {
 
   upgradeCommand?: boolean;
   skipPrettier?: boolean;
+  skipEslint?: boolean;
+  skipForks?: boolean;
   prettierExtensions: string[] = PRETTIER_EXTENSIONS.split(',');
   prettierOptions: PrettierOptions = { plugins: [] };
   refreshOnCommit = false;
@@ -202,15 +204,20 @@ export default class BootstrapGenerator extends BaseGenerator {
     const prettierTransforms: FileTransform<MemFsEditorFile>[] = [];
     if (!this.skipPrettier) {
       const ignoreErrors = this.options.ignoreErrors || this.upgradeCommand;
+      if (!this.skipEslint) {
+        prettierTransforms.push(
+          createESLintTransform.call(this, { ignoreErrors }),
+          createRemoveUnusedImportsTransform.call(this, { ignoreErrors }),
+        );
+      }
       prettierTransforms.push(
-        createESLintTransform.call(this, { ignoreErrors }),
-        createRemoveUnusedImportsTransform.call(this, { ignoreErrors }),
         await createPrettierTransform.call(this, {
           ignoreErrors,
           prettierPackageJson: true,
           prettierJava: !this.jhipsterConfig.skipServer,
           extensions: this.prettierExtensions.join(','),
           prettierOptions: this.prettierOptions,
+          skipForks: this.skipForks,
         }),
       );
     }

generators/bootstrap/support/prettier-support.ts

@@ -53,14 +53,21 @@ export class PrettierPool extends Piscina {
 
 export const createPrettierTransform = async function (
   this: CoreGenerator,
-  options: PrettierWorkerOptions & { ignoreErrors?: boolean; extensions?: string } = {},
+  options: PrettierWorkerOptions & { ignoreErrors?: boolean; extensions?: string; skipForks?: boolean } = {},
 ) {
-  const pool = new PrettierPool();
-
-  const { ignoreErrors = false, extensions = '*', ...workerOptions } = options;
+  const { ignoreErrors = false, extensions = '*', skipForks, ...workerOptions } = options;
   const globExpression = extensions.includes(',') ? `**/*.{${extensions}}` : `**/*.${extensions}`;
   const minimatch = new Minimatch(globExpression, { dot: true });
 
+  let applyPrettier;
+  const pool = skipForks ? undefined : new PrettierPool();
+  if (skipForks) {
+    const { default: applyPrettierWorker } = await import('./prettier-worker.js');
+    applyPrettier = applyPrettierWorker;
+  } else {
+    applyPrettier = data => pool!.apply(data);
+  }
+
   return passthrough(
     async (file: VinylMemFsEditorFile) => {
       if (!minimatch.match(file.path) || !isFileStateModified(file)) {
@@ -69,7 +76,7 @@ export const createPrettierTransform = async function (
       if (!file.contents) {
         throw new Error(`File content doesn't exist for ${file.relative}`);
       }
-      const { result, errorMessage } = await pool.apply({
+      const { result, errorMessage } = await applyPrettier({
         relativeFilePath: file.relative,
         filePath: file.path,
         fileContents: file.contents.toString('utf8'),
@@ -86,7 +93,7 @@ export const createPrettierTransform = async function (
       }
     },
     () => {
-      pool.destroy();
+      pool?.destroy();
     },
   );
 };