yeoman-generator 7.3.2 → 7.3.3

package/dist/actions/fs.js

@@ -29,7 +29,6 @@ export class FsMixin {
     copyTemplate(...args) {
         const [from, to, options = {}, ...remaining] = args;
         options.fromBasePath = options.fromBasePath ?? this.templatePath();
-        // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
         return this.fs.copy(from, this.destinationPath(to), options, ...remaining);
     }
     /**
@@ -55,7 +54,6 @@ export class FsMixin {
      * mem-fs-editor method's shortcut, for more information see [mem-fs-editor]{@link https://github.com/SBoudrias/mem-fs-editor}.
      * Shortcut for this.fs!.readJSON(this.destinationPath(filepath)).
      */
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     readDestinationJSON(...args) {
         return this.fs.readJSON(...applyToFirstStringArg(this.destinationPath.bind(this), args));
     }
@@ -72,7 +70,6 @@ export class FsMixin {
      * mem-fs-editor method's shortcut, for more information see [mem-fs-editor]{@link https://github.com/SBoudrias/mem-fs-editor}.
      * Shortcut for this.fs!.writeJSON(this.destinationPath(filepath)).
      */
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     writeDestinationJSON(...args) {
         return this.fs.writeJSON(...applyToFirstStringArg(this.destinationPath.bind(this), args));
     }
@@ -82,7 +79,6 @@ export class FsMixin {
      * Shortcut for this.fs!.delete(this.destinationPath(filepath)).
      */
     deleteDestination(...args) {
-        // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
         return this.fs.delete(...applyToFirstStringArg(this.destinationPath.bind(this), args));
     }
     /**
@@ -93,7 +89,6 @@ export class FsMixin {
     copyDestination(...args) {
         const [from, to, options = {}, ...remaining] = args;
         options.fromBasePath = options.fromBasePath ?? this.destinationPath();
-        // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
         return this.fs.copy(from, this.destinationPath(to), options, ...remaining);
     }
     /**
@@ -104,7 +99,6 @@ export class FsMixin {
     moveDestination(...args) {
         const [from, to, options = {}, ...remaining] = args;
         options.fromBasePath = options.fromBasePath ?? this.destinationPath();
-        // eslint-disable-next-line @typescript-eslint/no-confusing-void-expression
         return this.fs.move(from, this.destinationPath(to), options, ...remaining);
     }
     /**
@@ -186,7 +180,7 @@ export class FsMixin {
             if (!template.when || template.when(eachData, this)) {
                 return this.renderTemplateAsync(source, destination, eachData, template.templateOptions, template.copyOptions);
             }
-            return undefined;
+            return;
         }));
     }
     /**

package/dist/actions/help.js

@@ -18,7 +18,7 @@ export class HelpMixin {
     help() {
         const filepath = path.resolve(this.sourceRoot(), '../USAGE');
         const exists = fs.existsSync(filepath);
-        let out = ['Usage:', '  ' + this.usage(), ''];
+        let out = ['Usage:', `  ${this.usage()}`, ''];
         // Build options
         if (Object.keys(this._options).length > 0) {
             out = [...out, 'Options:', this.optionsHelp(), ''];
@@ -44,12 +44,12 @@ export class HelpMixin {
         let name = this._namespace;
         let args = '';
         if (this._arguments.length > 0) {
-            args = this._arguments.map(arg => formatArg(arg)).join(' ') + ' ';
+            args = `${this._arguments.map(arg => formatArg(arg)).join(' ')} `;
         }
         name = name.replace(/^yeoman:/, '');
         let out = `yo ${name} ${args}${options}`;
         if (this.description) {
-            out += '\n\n' + this.description;
+            out += `\n\n${this.description}`;
         }
         return out;
     }

package/dist/actions/lifecycle.d.ts

@@ -1,7 +1,7 @@
 import type { BaseGenerator, GetGeneratorOptions } from '@yeoman/types';
 import { type FileTransform } from 'mem-fs';
 import { type MemFsEditorFile } from 'mem-fs-editor';
-import type { Task, TaskOptions, BaseOptions, Priority, ComposeOptions, GeneratorPipelineOptions } from '../types.js';
+import type { BaseOptions, ComposeOptions, GeneratorPipelineOptions, Priority, Task, TaskOptions } from '../types.js';
 import type Generator from '../index.js';
 import type BaseGeneratorImpl from '../generator.js';
 type TaskStatus = {
@@ -83,7 +83,7 @@ export declare abstract class TasksMixin {
      * @param args: Task arguments.
      * @param taskStatus.
      */
-    executeTask(this: BaseGeneratorImpl, task: Task, args?: any[] | ((generator: Generator<BaseOptions, import("../types.js").BaseFeatures>) => any[]), taskStatus?: TaskStatus | undefined): Promise<void>;
+    executeTask(this: BaseGeneratorImpl, task: Task, args?: any[] | ((generator: Generator) => any[]), taskStatus?: TaskStatus | undefined): Promise<void>;
     /**
      * Ignore cancellable tasks.
      */

package/dist/actions/lifecycle.js

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/member-ordering */
 import { dirname, isAbsolute, resolve as pathResolve, relative } from 'node:path';
 import { pathToFileURL } from 'node:url';
 import { createRequire } from 'node:module';
@@ -7,7 +6,6 @@ import { stat } from 'node:fs/promises';
 import createDebug from 'debug';
 import { toNamespace } from '@yeoman/namespace';
 import { isFileTransform } from 'mem-fs';
-// eslint-disable-next-line n/file-extension-in-import
 import { isFilePending } from 'mem-fs-editor/state';
 const debug = createDebug('yeoman:generator');
 // Ensure a prototype method is a candidate run by default
@@ -180,14 +178,9 @@ export class TasksMixin {
         const methods = Object.keys(this.getTaskSourcesPropertyDescriptors());
         let validMethods = methods.filter(method => methodIsValid(method));
         const { taskPrefix } = this.features;
-        if (taskPrefix) {
-            validMethods = validMethods
-                .filter(method => method.startsWith(taskPrefix))
-                .map(method => method.slice(taskPrefix.length));
-        }
-        else {
-            validMethods = validMethods.filter(method => !method.startsWith('#'));
-        }
+        validMethods = taskPrefix
+            ? validMethods.filter(method => method.startsWith(taskPrefix)).map(method => method.slice(taskPrefix.length))
+            : validMethods.filter(method => !method.startsWith('#'));
         if (this.features.tasksMatchingPriority) {
             const queueNames = Object.keys(this._queues);
             validMethods = validMethods.filter(method => queueNames.includes(method));
@@ -344,7 +337,6 @@ export class TasksMixin {
         }
         this.queueOwnTasks({ auto: true });
     }
-    // eslint-disable-next-line max-params
     async composeWith(generator, args, options, immediately = false) {
         if (Array.isArray(generator)) {
             const generators = [];
@@ -412,9 +404,10 @@ export class TasksMixin {
             try {
                 generatorFile = await this.resolveGeneratorPath(generator.path ?? generator.Generator.resolved);
             }
-            catch { }
+            catch {
+                // Ignore error
+            }
             const resolved = generatorFile ?? generator.path ?? generator.Generator.resolved;
-            // eslint-disable-next-line @typescript-eslint/naming-convention
             return this.composeLocallyWithOptions({ Generator: generator.Generator, resolved }, composeOptions);
         }
         if (skipEnvRegister || isAbsolute(generator) || generator.startsWith('.')) {
@@ -426,11 +419,16 @@ export class TasksMixin {
             try {
                 generator = await this.resolveGeneratorPath(generator);
             }
-            catch { }
+            catch {
+                // Ignore error
+            }
         }
         return this.env.composeWith(generator, composeOptions);
     }
     async composeLocallyWithOptions({ Generator, resolved = Generator.resolved }, options = {}) {
+        if (!resolved) {
+            throw new Error('Generator path property is not a string');
+        }
         const generatorNamespace = this.env.namespace(resolved);
         const findGenerator = async () => {
             const generatorImport = await import(resolved);
@@ -441,7 +439,12 @@ export class TasksMixin {
             }
             return typeof generatorImport.default === 'function' ? generatorImport.default : generatorImport;
         };
-        Generator = Generator ?? (await findGenerator());
+        try {
+            Generator = Generator ?? (await findGenerator());
+        }
+        catch {
+            throw new Error('Missing Generator property');
+        }
         Generator.namespace = generatorNamespace;
         Generator.resolved = resolved;
         return this.env.composeWith(Generator, options);
@@ -457,7 +460,9 @@ export class TasksMixin {
                 generatorResolvedFile = generatorFile;
             }
         }
-        catch { }
+        catch {
+            // Ignore error
+        }
         if (!generatorResolvedFile) {
             // Resolve the generator file.
             // Use import.resolve when stable.

package/dist/actions/package-json.js

@@ -23,7 +23,6 @@ export class PackageJsonMixin {
             : dependencies;
         return Object.fromEntries(await Promise.all(
         // Make sure to convert empty string too
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         Object.entries(depMap).map(async ([pkg, version]) => [pkg, version || (await latestVersion(pkg))])));
     }
     /**

package/dist/actions/spawn-command.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="node" resolution-mode="require"/>
-import { type Options as ExecaOptions, type ExecaChildProcess, type SyncOptions, type ExecaSyncReturnValue } from 'execa';
+import { type ExecaChildProcess, type Options as ExecaOptions, type ExecaSyncReturnValue, type SyncOptions } from 'execa';
 export declare class SpawnCommandMixin {
     /**
      * Normalize a command across OS and spawn it (asynchronously).

package/dist/actions/spawn-command.js

@@ -1,4 +1,4 @@
-import { execa, execaSync, execaCommand, execaCommandSync, } from 'execa';
+import { execa, execaCommand, execaCommandSync, execaSync, } from 'execa';
 export class SpawnCommandMixin {
     spawnCommand(command, args, opt) {
         if (Array.isArray(args) || (opt && args === undefined)) {

package/dist/constants.js

@@ -1,3 +1,2 @@
-// eslint-disable-next-line @typescript-eslint/naming-convention
 export const DESTINATION_ROOT_CHANGE_EVENT = 'destinationRootChange';
 export const requiredEnvironmentVersion = '4.0.0-rc.0';

package/dist/generator.d.ts

@@ -1,11 +1,10 @@
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'node:events';
 import * as _ from 'lodash-es';
 import createDebug from 'debug';
 import { type MemFsEditor } from 'mem-fs-editor';
 import { type YeomanNamespace } from '@yeoman/namespace';
 import type { BaseEnvironment, BaseGenerator as GeneratorApi, Logger, QueuedAdapter } from '@yeoman/types';
-import type { ArgumentSpec, BaseOptions, BaseFeatures, CliOptionSpec, Priority } from './types.js';
+import type { ArgumentSpec, BaseFeatures, BaseOptions, CliOptionSpec, Priority } from './types.js';
 import type { PromptAnswers, PromptQuestions, QuestionRegistrationOptions } from './questions.js';
 import Storage, { type StorageOptions } from './util/storage.js';
 import { FsMixin } from './actions/fs.js';

package/dist/generator.js

@@ -1,5 +1,5 @@
 import fs, { readFileSync } from 'node:fs';
-import path, { dirname, resolve as pathResolve, join as pathJoin } from 'node:path';
+import path, { dirname, join as pathJoin, resolve as pathResolve } from 'node:path';
 import os from 'node:os';
 import { EventEmitter } from 'node:events';
 import { fileURLToPath } from 'node:url';
@@ -22,15 +22,11 @@ import { GitMixin } from './actions/user.js';
 import { TasksMixin } from './actions/lifecycle.js';
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
-// eslint-disable-next-line @typescript-eslint/naming-convention
 const EMPTY = '@@_YEOMAN_EMPTY_MARKER_@@';
-// eslint-disable-next-line @typescript-eslint/naming-convention
 const ENV_VER_WITH_VER_API = '2.9.0';
 const packageJson = JSON.parse(readFileSync(pathJoin(_dirname, '../package.json'), 'utf8'));
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
-export class BaseGenerator
-// eslint-disable-next-line unicorn/prefer-event-target
- extends EventEmitter {
+export class BaseGenerator extends EventEmitter {
     options;
     _initOptions;
     _args;
@@ -76,7 +72,6 @@ export class BaseGenerator
     _running = false;
     features;
     yoGeneratorVersion = packageJson.version;
-    // eslint-disable-next-line complexity
     constructor(args, options, features) {
         super();
         const actualArgs = Array.isArray(args) ? args : [];
@@ -86,7 +81,6 @@ export class BaseGenerator
         // Load parameters
         this._args = actualArgs;
         this.options = generatorOptions;
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         this.features = actualFeatures ?? {};
         // Initialize properties
         this._options = {};
@@ -231,7 +225,6 @@ export class BaseGenerator
         if (runningVersion === undefined) {
             return true;
         }
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (this.options.ignoreVersionCheck || warning) {
             console.warn(`Current ${packageDependency} is not compatible with current generator, min required: ${versionToCheck} current version: ${runningVersion}. Some features may be missing, try updating reinstalling 'yo'.`);
             return false;
@@ -357,7 +350,7 @@ export class BaseGenerator
         }
         const spec = typeof name === 'object'
             ? name
-            : { hide: false, type: Boolean, description: 'Description for ' + name, ...config, name };
+            : { hide: false, type: Boolean, description: `Description for ${name}`, ...config, name };
         const specName = spec.name;
         // Check whether boolean option is invalid (starts with no-)
         const boolOptionRegex = /^no-/;
@@ -366,7 +359,7 @@ export class BaseGenerator
             throw new Error([
                 `Option name ${chalk.yellow(specName)} cannot start with ${chalk.red('no-')}\n`,
                 `Option name prefixed by ${chalk.yellow('--no')} are parsed as implicit`,
-                ` boolean. To use ${chalk.yellow('--' + specName)} as an option, use\n`,
+                ` boolean. To use ${chalk.yellow(`--${specName}`)} as an option, use\n`,
                 chalk.cyan(`  this.option('${simpleName}', {type: Boolean})`),
             ].join(''));
         }
@@ -449,7 +442,6 @@ export class BaseGenerator
         for (const [name, option] of Object.entries(parsedOptions)) {
             // Manually set value as undefined if it should be.
             if (option === EMPTY) {
-                // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
                 delete parsedOptions[name];
             }
             else if (this._options[name] && option !== undefined) {
@@ -471,7 +463,7 @@ export class BaseGenerator
                 }
             }
             else if (config.type === Array) {
-                value = parsedOptions._.slice(index, parsedOptions._.length);
+                value = parsedOptions._.slice(index);
             }
             else {
                 value = config.type(parsedOptions._[index]);
@@ -637,7 +629,7 @@ export class BaseGenerator
      * @return joined path
      */
     templatePath(...dest) {
-        let filepath = path.join.apply(path, dest);
+        let filepath = path.join(...dest);
         if (!path.isAbsolute(filepath)) {
             filepath = path.join(this.sourceRoot(), filepath);
         }
@@ -649,7 +641,7 @@ export class BaseGenerator
      * @return joined path
      */
     destinationPath(...dest) {
-        let filepath = path.join.apply(path, dest);
+        let filepath = path.join(...dest);
         if (!path.isAbsolute(filepath)) {
             filepath = path.join(this.destinationRoot(), filepath);
         }
@@ -665,7 +657,7 @@ export class BaseGenerator
      */
     determineAppname() {
         const appName = this.packageJson.get('name') ?? path.basename(this.destinationRoot());
-        return appName.replaceAll(/[^\w\s]+?/g, ' ');
+        return appName.replaceAll(/[^\s\w]+?/g, ' ');
     }
 }
 applyMixins(BaseGenerator, [FsMixin, HelpMixin, PackageJsonMixin, SpawnCommandMixin, GitMixin, TasksMixin]);

package/dist/index.js

@@ -25,7 +25,6 @@ export default class Generator extends BaseGenerator {
         if (!this._simpleGit) {
             this._simpleGit = simpleGit({ baseDir: this.destinationPath() }).env({
                 ...process.env,
-                // eslint-disable-next-line @typescript-eslint/naming-convention
                 LANG: 'en',
             });
             this.on(DESTINATION_ROOT_CHANGE_EVENT, () => {

package/dist/types-utils.d.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 /**
  * https://github.com/microsoft/TypeScript/issues/14107#issuecomment-1146738780
  */

package/dist/util/prompt-suggestion.d.ts

@@ -7,7 +7,7 @@ import type Storage from './storage.js';
  * @param questions Original prompt questions
  * @return Prompt questions array with prefilled values.
  */
-export declare const prefillQuestions: <A extends import("inquirer").Answers = import("inquirer").Answers>(store: Storage, questions: PromptQuestion<A>[]) => PromptQuestion<A>[];
+export declare const prefillQuestions: <A extends PromptAnswers = PromptAnswers>(store: Storage, questions: Array<PromptQuestion<A>>) => PromptQuestion<A>[];
 /**
  * Store the answers in the global store
  *

package/dist/util/prompt-suggestion.js

@@ -1,5 +1,4 @@
 import assert from 'node:assert';
-// eslint-disable-next-line @typescript-eslint/promise-function-async
 const getChoices = (question) => {
     if (question.type === 'list') {
         return question.choices;
@@ -13,7 +12,7 @@ const getChoices = (question) => {
     if (question.type === 'rawlist') {
         return question.choices;
     }
-    return undefined;
+    return;
 };
 /**
  * Returns the default value for a checkbox

package/dist/util/storage.js

@@ -1,5 +1,5 @@
 import assert from 'node:assert';
-import { cloneDeep, defaults as setDefaults, merge, get, set } from 'lodash-es';
+import { cloneDeep, get, merge, set, defaults as setDefaults } from 'lodash-es';
 import sortKeys from 'sort-keys';
 /**
  * Proxy handler for Storage
@@ -220,7 +220,6 @@ class Storage {
      */
     delete(key) {
         const store = this._store;
-        // eslint-disable-next-line  @typescript-eslint/no-dynamic-delete
         delete store[key];
         this._persist(store);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-generator",
-  "version": "7.3.2",
+  "version": "7.3.3",
   "description": "Rails-inspired generator system that provides scaffolding for your apps",
   "keywords": [
     "development",
@@ -44,15 +44,15 @@
     "doc:generate": "jsdoc -c jsdoc.json -d $npm_package_config_doc_path$DOC_FOLDER",
     "doc:prettier": "prettier $npm_package_config_doc_path$DOC_FOLDER --write --ignore-path .prettierignore-doc",
     "prepare": "npm run build",
-    "pretest": "xo",
-    "test": "c8 esmocha --forbid-only"
+    "pretest": "eslint . && npm run build",
+    "test": "vitest run --coverage"
   },
   "config": {
     "doc_path": "../yeoman-generator-doc/"
   },
   "dependencies": {
     "@types/lodash-es": "^4.17.9",
-    "@types/node": "^18.18.5",
+    "@types/node": ">=18.18.5",
     "@yeoman/namespace": "^1.0.0",
     "chalk": "^5.3.0",
     "debug": "^4.1.1",
@@ -72,39 +72,33 @@
   "devDependencies": {
     "@types/debug": "^4.1.9",
     "@types/ejs": "^3.1.4",
-    "@types/inquirer": "^9.0.4",
+    "@types/json-schema": "^7.0.15",
     "@types/minimist": "^1.2.3",
     "@types/semver": "^7.5.3",
     "@types/sinon": "^17.0.1",
     "@types/text-table": "^0.2.3",
+    "@vitest/coverage-v8": "^2.0.5",
     "@yeoman/adapter": "^1.4.0",
-    "@yeoman/transform": "^1.2.0",
-    "c8": "^8.0.1",
+    "@yeoman/eslint": "^0.2.0",
+    "@yeoman/transform": "^2.0.0",
     "cpy-cli": "^5.0.0",
     "ejs": "^3.1.9",
-    "esmocha": "^1.0.1",
-    "inquirer": "^9.2.11",
+    "inquirer": "^11.1.0",
     "jsdoc": "^4.0.2",
     "nock": "^13.3.4",
     "prettier": "^3.0.3",
     "prettier-plugin-packagejson": "^2.4.6",
-    "sinon": "^18.0.0",
+    "sinon": "^19.0.0",
     "tui-jsdoc-template": "^1.2.2",
     "typescript": "^5.2.2",
-    "xo": "^0.56.0",
+    "vitest": "^2.0.5",
     "yeoman-assert": "^3.1.1",
-    "yeoman-environment": "^4.0.0",
-    "yeoman-test": "^8.1.0"
+    "yeoman-environment": "^4.4.1",
+    "yeoman-test": "^9.0.0"
   },
   "peerDependencies": {
     "@yeoman/types": "^1.1.1",
-    "mem-fs": "^4.0.0",
-    "yeoman-environment": "^4.0.0"
-  },
-  "peerDependenciesMeta": {
-    "yeoman-environment": {
-      "optional": true
-    }
+    "mem-fs": "^4.0.0"
   },
   "engines": {
     "node": "^18.17.0 || >=20.5.0"