convert files to typescript and move testing to lib

.blueprint/from-issue/command.mts

@@ -18,7 +18,7 @@
  */
 import type { JHipsterCommandDefinition } from '../../lib/command/index.js';
 import { GENERATOR_APP, GENERATOR_WORKSPACES } from '../../generators/generator-list.js';
-import { parseIssue } from '../../testing/github.js';
+import { parseIssue } from '../../lib/testing/github.js';
 
 const command: JHipsterCommandDefinition = {
   configs: {

.blueprint/from-issue/generator.mts

@@ -1,7 +1,7 @@
 import { join } from 'node:path';
 
 import BaseGenerator from '../../generators/base/index.js';
-import { getGithubIssue, setGithubTaskOutput, prepareSample } from '../../testing/index.js';
+import { getGithubIssue, setGithubTaskOutput, prepareSample } from '../../lib/testing/index.js';
 import { promptSamplesFolder } from '../support.mjs';
 import { GENERATOR_APP, GENERATOR_JDL, GENERATOR_WORKSPACES } from '../../generators/generator-list.js';
 import { extractDataFromInfo, type InfoData } from '../../generators/info/support/index.js';

.blueprint/generate-generator/templates/generator.spec.ts.ejs

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'node:url';
 import { before, it, describe, expect } from 'esmocha';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '<%- generatorRelativePath %>../test/support/tests.js';
-import { defaultHelpers as helpers, result } from '<%- generatorRelativePath %>../testing/index.js';
+import { defaultHelpers as helpers, result } from '<%- generatorRelativePath %>../lib/testing/index.js';
 import Generator from './index.js';
 
 const __filename = fileURLToPath(import.meta.url);

.blueprint/generate-sample/generator.mjs → .blueprint/generate-sample/generator.mts

@@ -5,6 +5,7 @@ import { packageJson } from '../../lib/index.js';
 import { promptSamplesFolder } from '../support.mjs';
 import { GENERATOR_APP, GENERATOR_INFO, GENERATOR_JDL } from '../../generators/generator-list.js';
 import { entitiesByType, generateSample } from './support/index.js';
+import assert from 'assert';
 
 export default class extends BaseGenerator {
   sampleName;
@@ -65,11 +66,12 @@ export default class extends BaseGenerator {
           destProjectFolder: this.projectFolder,
           fork: false,
         });
+        assert.ok(sample, `Sample ${this.sampleName} not found`);
 
         // Cleanup mem-fs files. Reload them from disk.
         await this.pipeline(
           { refresh: true, pendingFiles: false },
-          transform(() => {}),
+          transform(() => undefined),
         );
 
         let generatorOptions = {
@@ -124,7 +126,7 @@ export default class extends BaseGenerator {
             generatorOptions: {
               samplePath: this.sampleName,
             },
-          });
+          } as any);
         }
       },
       async info() {

.blueprint/generate-sample/support/generate-sample.js → .blueprint/generate-sample/support/generate-sample.ts

@@ -21,7 +21,15 @@ export const generateSample = async (
     jdlEntity: passedJdlEntity,
     jdlSamples: passedJdlSamples,
     fork = true,
-  } = {},
+  }: {
+    destProjectFolder: string;
+    environment?: string;
+    war?: boolean;
+    entity?: string;
+    jdlEntity?: string;
+    jdlSamples?: string;
+    fork?: boolean;
+  },
 ) => {
   if (!sampleName) {
     throw new Error('Sample name is required');

.blueprint/generate-sample/support/get-workflow-samples.js → .blueprint/generate-sample/support/get-workflow-samples.ts

@@ -7,7 +7,7 @@ export const DAILY_PREFIX = 'daily-';
 
 export const isDaily = workflow => workflow.startsWith(DAILY_PREFIX);
 
-export const getWorkflowSamples = (workflows = WORKFLOW_NAMES) =>
+export const getWorkflowSamples = (workflows: string[] = WORKFLOW_NAMES) =>
   Object.fromEntries(
     workflows.map(workflow => [
       workflow,
@@ -27,7 +27,7 @@ export const getWorkflowSamples = (workflows = WORKFLOW_NAMES) =>
     ]),
   );
 
-export default workflows =>
+export default (workflows?: string[]) =>
   Object.fromEntries(
     Object.values(getWorkflowSamples(workflows))
       .map(workflowSamples => Object.entries(workflowSamples))

.blueprint/update-vscode/generator.mjs → .blueprint/update-vscode/generator.mts

@@ -13,7 +13,7 @@ export default class extends BaseGenerator {
       async generateVscodeLaunch() {
         const vscodeLaunch = join(getPackageRoot(), '.vscode/launch.json');
 
-        const baseFile = {
+        const baseFile: { version: string; inputs: any[]; configurations: any } = {
           version: '0.2.0',
           inputs: [],
           configurations: [

cli/cli.spec.mts

@@ -10,7 +10,7 @@ import type FullEnvironment from 'yeoman-environment';
 import { coerce } from 'semver';
 import quibble from 'quibble';
 
-import { defaultHelpers as helpers, createBlueprintFiles } from '../testing/index.js';
+import { defaultHelpers as helpers, createBlueprintFiles } from '../lib/testing/index.js';
 import { getCommand as actualGetCommonand } from './utils.mjs';
 import { createProgram } from './program.mjs';
 

cli/environment-builder.mjs

@@ -406,7 +406,9 @@ export default class EnvironmentBuilder {
     for (const [blueprint, packagePath] of blueprintPackagePaths) {
       let blueprintCommand;
       const blueprintCommandFile = `${packagePath}/cli/commands`;
-      const blueprintCommandExtension = ['.js', '.cjs', '.mjs'].find(extension => existsSync(`${blueprintCommandFile}${extension}`));
+      const blueprintCommandExtension = ['.js', '.cjs', '.mjs', '.ts', '.cts', '.mts'].find(extension =>
+        existsSync(`${blueprintCommandFile}${extension}`),
+      );
       if (blueprintCommandExtension) {
         const blueprintCommandsUrl = pathToFileURL(resolve(`${blueprintCommandFile}${blueprintCommandExtension}`));
         try {

cli/environment-builder.spec.mts

@@ -22,7 +22,7 @@ import fs from 'fs';
 import { expect } from 'chai';
 import sinon from 'sinon';
 import { before, it, describe, after, expect as jestExpect, beforeEach } from 'esmocha';
-import { defaultHelpers as helpers, createBlueprintFiles } from '../testing/index.js';
+import { defaultHelpers as helpers, createBlueprintFiles } from '../lib/testing/index.js';
 
 import EnvironmentBuilder from './environment-builder.mjs';
 

cli/program.spec.mts

@@ -3,7 +3,7 @@
 import { expect } from 'chai';
 import { describe, it, beforeEach } from 'esmocha';
 
-import { defaultHelpers as helpers } from '../testing/index.js';
+import { defaultHelpers as helpers } from '../lib/testing/index.js';
 import { createProgram } from './program.mjs';
 
 describe('cli - program', () => {

generators/angular/generator.spec.ts

@@ -3,7 +3,7 @@ import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { buildClientSamples, entitiesClientSamples as entities, defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
 import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';

generators/app/composing.spec.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import { before, describe, it } from 'esmocha';
 
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { GENERATOR_APP } from '../generator-list.js';
 
 const allMockedComposedGenerators = [

generators/app/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import { getCommandHelpOutput, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import Generator from './index.js';
 
 const __filename = fileURLToPath(import.meta.url);

generators/base-application/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, describe, esmocha, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import Generator from './index.js';
 

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 '../../testing/index.js';
+import { basicHelpers 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 '../../testing/index.js';
+import { basicHelpers as helpers } from '../../lib/testing/index.js';
 import { packageJson } from '../../lib/index.js';
 import BaseGenerator from './index.js';
 

generators/base/generator.spec.ts

@@ -22,7 +22,7 @@ import { before, describe, esmocha, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import EnvironmentBuilder from '../../cli/environment-builder.mjs';
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { getCommandHelpOutput, shouldSupportFeatures } from '../../test/support/tests.js';
 import BaseGenerator from './index.js';
 

generators/bootstrap-application-base/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, beforeEach, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import { parseChangelog } from '../base/support/timestamp.js';
 import Generator from './index.js';

generators/bootstrap-application-client/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import Generator from './index.js';
 

generators/bootstrap-application-server/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import Generator from './index.js';
 

generators/bootstrap-application/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { defaultHelpers as helpers, result as runResult } from '../../testing/index.js';
+import { defaultHelpers as helpers, result as runResult } from '../../lib/testing/index.js';
 import { fieldTypes } from '../../lib/jhipster/index.js';
 import { shouldSupportFeatures } from '../../test/support/tests.js';
 import Generator from './index.js';

generators/bootstrap/support/auto-crlf-transform.spec.ts

@@ -1,5 +1,5 @@
 import { before, describe, expect, it } from 'esmocha';
-import { defaultHelpers as helpers } from '../../../testing/index.js';
+import { defaultHelpers as helpers } from '../../../lib/testing/index.js';
 import { detectCrLf } from './auto-crlf-transform.js';
 
 describe('generator - bootstrap - utils', () => {

generators/ci-cd/ci-cd.spec.ts

@@ -1,6 +1,6 @@
 import { before, describe, expect, it } from 'esmocha';
 import { GENERATOR_CI_CD } from '../generator-list.js';
-import { dryRunHelpers as helpers } from '../../testing/index.js';
+import { dryRunHelpers as helpers } from '../../lib/testing/index.js';
 
 const expectedFiles = {
   travis: ['.travis.yml'],

generators/client/generator-needles.spec.ts

@@ -1,5 +1,5 @@
 import { before, describe, it } from 'esmocha';
-import { getGenerator, basicHelpers as helpers, result as runResult } from '../../testing/index.js';
+import { getGenerator, basicHelpers as helpers, result as runResult } from '../../lib/testing/index.js';
 import { CLIENT_WEBPACK_DIR } from '../generator-constants.js';
 import { clientFrameworkTypes } from '../../lib/jhipster/index.js';
 import ClientGenerator from './index.js';

generators/client/generator.spec.ts

@@ -22,7 +22,7 @@ import assert from 'assert';
 import { snakeCase } from 'lodash-es';
 import { before, describe, expect, it } from 'esmocha';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
-import { defaultHelpers as helpers, result } from '../../testing/index.js';
+import { defaultHelpers as helpers, result } from '../../lib/testing/index.js';
 import { testFrameworkTypes } from '../../lib/jhipster/index.js';
 import { GENERATOR_CLIENT } from '../generator-list.js';
 import Generator from './index.js';

generators/client/generators/common/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'node:url';
 import { before, describe, expect, it } from 'esmocha';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../../../test/support/tests.js';
-import { defaultHelpers as helpers, result } from '../../../../testing/index.js';
+import { defaultHelpers as helpers, result } from '../../../../lib/testing/index.js';
 import Generator from './index.js';
 
 const __filename = fileURLToPath(import.meta.url);

generators/client/needle-client.spec.ts

@@ -1,7 +1,7 @@
 import { before, describe, it } from 'esmocha';
 import ClientGenerator from '../../generators/client/index.js';
 import { CLIENT_MAIN_SRC_DIR } from '../generator-constants.js';
-import { getGenerator, dryRunHelpers as helpers, result as runResult } from '../../testing/index.js';
+import { getGenerator, dryRunHelpers as helpers, result as runResult } from '../../lib/testing/index.js';
 
 const mockBlueprintSubGen: any = class extends ClientGenerator {
   constructor(args, opts, features) {

generators/client/prompts.spec.ts

@@ -1,5 +1,5 @@
 import { before, describe, it } from 'esmocha';
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import {
   applicationTypes,
   authenticationTypes,

generators/common/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
-import { basicHelpers, defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { basicHelpers, defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
 import { GENERATOR_COMMON } from '../generator-list.js';
 import Generator from './index.js';

generators/cucumber/generator.spec.ts

@@ -4,7 +4,7 @@ import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers, result } from '../../testing/index.js';
+import { defaultHelpers as helpers, result } from '../../lib/testing/index.js';
 
 import { GENERATOR_CUCUMBER } from '../generator-list.js';
 import Generator from './index.js';

generators/cypress/generator.spec.ts

@@ -21,7 +21,7 @@ import { fileURLToPath } from 'url';
 import { after, before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 import { clientFrameworkTypes, testFrameworkTypes } from '../../lib/jhipster/index.js';
-import { AuthenticationTypeMatrix, extendMatrix, fromMatrix, defaultHelpers as helpers } from '../../testing/index.js';
+import { AuthenticationTypeMatrix, extendMatrix, fromMatrix, defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
 import { GENERATOR_CYPRESS } from '../generator-list.js';
 import Generator from './generator.js';

generators/docker-compose/docker-compose.spec.ts

@@ -2,7 +2,7 @@ import { before, describe, expect, it } from 'esmocha';
 import monitoringTypes from '../../lib/jhipster/monitoring-types.js';
 import applicationTypes from '../../lib/jhipster/application-types.js';
 import { GENERATOR_DOCKER_COMPOSE } from '../generator-list.js';
-import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { getGenerator, defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 
 const { PROMETHEUS } = monitoringTypes;
 const { MICROSERVICE, MONOLITH } = applicationTypes;

generators/docker/__test-support/service-discovery-matcher.ts

@@ -1,7 +1,7 @@
 import type { RunResult } from 'yeoman-test';
 
 import { JAVA_DOCKER_DIR } from '../../generator-constants.js';
-import { matchWrittenConfig, matchWrittenFiles } from '../../../testing/index.js';
+import { matchWrittenConfig, matchWrittenFiles } from '../../../lib/testing/index.js';
 
 const expectedEurekaFiles = () => {
   return [

generators/docker/generator.spec.ts

@@ -28,7 +28,7 @@ import {
   extendMatrix,
   defaultHelpers as helpers,
   runResult,
-} from '../../testing/index.js';
+} from '../../lib/testing/index.js';
 import { matchElasticSearchDocker } from '../spring-data-elasticsearch/__test-support/elastic-search-matcher.js';
 
 import { cacheTypes, databaseTypes, searchEngineTypes, serviceDiscoveryTypes } from '../../lib/jhipster/index.js';

generators/entities/generator.spec.ts

@@ -23,7 +23,7 @@ import { snakeCase } from 'lodash-es';
 
 import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR } from '../generator-constants.js';
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js';
+import { skipPrettierHelpers as helpers, result as runResult } from '../../lib/testing/index.js';
 import Generator from './generator.js';
 
 const __filename = fileURLToPath(import.meta.url);

generators/entity/database-changelog.spec.ts

@@ -1,5 +1,5 @@
 import { before, describe, it } from 'esmocha';
-import { getGenerator, defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { getGenerator, defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import { SERVER_MAIN_RES_DIR } from '../generator-constants.js';
 import BaseApplicationGenerator from '../base-application/generator.js';
 

generators/entity/single-entity.spec.ts

@@ -1,5 +1,5 @@
 import { after, before, describe, expect, it } from 'esmocha';
-import { skipPrettierHelpers as helpers, result as runResult } from '../../testing/index.js';
+import { skipPrettierHelpers as helpers, result as runResult } from '../../lib/testing/index.js';
 import { CLIENT_MAIN_SRC_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR } from '../generator-constants.js';
 import BaseApplicationGenerator from '../base-application/generator.js';
 import { GENERATOR_ENTITY } from '../generator-list.js';

generators/export-jdl/export-jdl.spec.ts

@@ -1,5 +1,5 @@
 import { before, describe, expect, it } from 'esmocha';
-import { defaultHelpers as helpers } from '../../testing/index.js';
+import { defaultHelpers as helpers } from '../../lib/testing/index.js';
 import { GENERATOR_EXPORT_JDL } from '../generator-list.js';
 
 const files = {

generators/feign-client/generator.spec.ts

@@ -1,7 +1,7 @@
 import { basename, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { before, describe, expect, it } from 'esmocha';
-import { defaultHelpers as helpers, runResult } from '../../testing/index.js';
+import { defaultHelpers as helpers, runResult } from '../../lib/testing/index.js';
 import { checkEnforcements, shouldSupportFeatures, testBlueprintSupport } from '../../test/support/index.js';
 import Generator from '../server/index.js';
 

generators/gatling/generator.spec.ts

@@ -4,7 +4,7 @@ import { before, describe, expect, it } from 'esmocha';
 import { snakeCase } from 'lodash-es';
 
 import { shouldSupportFeatures, testBlueprintSupport } from '../../test/support/tests.js';
-import { defaultHelpers as helpers, result } from '../../testing/index.js';
+import { defaultHelpers as helpers, result } from '../../lib/testing/index.js';
 
 import { GENERATOR_GATLING } from '../generator-list.js';
 import Generator from './index.js';