yeoman-environment 6.0.0 → 6.1.0

package/dist/composed-store.d.ts

@@ -1,5 +1,5 @@
 import type { BaseGenerator, Logger } from '@yeoman/types';
-import type { InstallTask } from './package-manager.ts';
+import type { PackageManagerInstallTaskOptions } from './package-manager.ts';
 export declare class ComposedStore {
     private readonly log?;
     private readonly generators;
@@ -9,15 +9,15 @@ export declare class ComposedStore {
         log?: Logger;
     });
     get customCommitTask(): (() => Promise<void> | void) | undefined;
-    get customInstallTask(): InstallTask | undefined;
+    get customInstallTask(): PackageManagerInstallTaskOptions['customInstallTask'] | undefined;
     getGenerators(): Record<string, BaseGenerator>;
     addGenerator(generator: BaseGenerator): {
-        uniqueBy: any;
-        identifier: any;
+        uniqueBy: string;
+        identifier: string | undefined;
         added: boolean;
         generator: BaseGenerator | undefined;
     } | {
-        identifier: any;
+        identifier: string | undefined;
         added: boolean;
         generator: BaseGenerator;
         uniqueBy?: undefined;

package/dist/composed-store.js

@@ -2,6 +2,9 @@ import crypto from 'node:crypto';
 import { toNamespace } from '@yeoman/namespace';
 import createdLogger from 'debug';
 const debug = createdLogger('yeoman:environment:composed-store');
+const getFeaturesFromGenerator = (generator) => {
+    return generator.features ?? generator.getFeatures?.() ?? {};
+};
 export class ComposedStore {
     log;
     generators = {};
@@ -20,7 +23,7 @@ export class ComposedStore {
         return { ...this.generators };
     }
     addGenerator(generator) {
-        const { features = generator.getFeatures?.() ?? {} } = generator;
+        const features = getFeaturesFromGenerator(generator);
         let { uniqueBy } = features;
         const { uniqueGlobally } = features;
         let identifier = uniqueBy;
@@ -56,8 +59,8 @@ export class ComposedStore {
     findFeature(featureName) {
         return Object.entries(this.generators)
             .map(([generatorId, generator]) => {
-            const { features = generator.getFeatures?.() } = generator;
-            const feature = features?.[featureName];
+            const features = getFeaturesFromGenerator(generator);
+            const feature = features[featureName];
             return feature ? { generatorId, feature: feature } : undefined;
         })
             .filter(Boolean);

package/dist/environment-full.d.ts

@@ -70,7 +70,7 @@ declare class FullEnvironment extends EnvironmentBase {
      * @param  {Object} packages - packages to install key(packageName): value(versionRange).
      * @return  {Boolean} - true if the install succeeded.
      */
-    installLocalGenerators(packages: Record<string, string | undefined>): Promise<boolean>;
+    installLocalGenerators(packages: Record<string, string | undefined>, forceInstall?: boolean): Promise<boolean>;
     /**
      * Lookup and register generators from the custom local repository.
      *

package/dist/environment-full.js

@@ -74,7 +74,7 @@ class FullEnvironment extends EnvironmentBase {
             }
             groups[base].push(namespace);
         }
-        for (const key of Object.keys(groups).sort()) {
+        for (const key of Object.keys(groups).toSorted()) {
             const group = groups[key];
             if (group.length > 0) {
                 out.push('', key.charAt(0).toUpperCase() + key.slice(1));
@@ -192,9 +192,24 @@ class FullEnvironment extends EnvironmentBase {
      * @param  {Object} packages - packages to install key(packageName): value(versionRange).
      * @return  {Boolean} - true if the install succeeded.
      */
-    async installLocalGenerators(packages) {
+    async installLocalGenerators(packages, forceInstall = false) {
         const entries = Object.entries(packages);
         const specs = entries.map(([packageName, version]) => `${packageName}${version ? `@${version}` : ''}`);
+        if (forceInstall) {
+            this.adapter.log.info(`Force install is enabled. Proceeding with installation.`);
+        }
+        else {
+            const { aproveInstall } = await this.adapter.prompt({
+                message: `The following packages need to be installed in the local repository: ${specs.join(', ')}. Do you want to proceed?`,
+                type: 'confirm',
+                name: 'aproveInstall',
+                default: false,
+            });
+            if (!aproveInstall) {
+                throw new Error(`Installation of ${specs.join(', ')} is declined by the user. Install manually and try again.`);
+            }
+        }
+        this.adapter.log.info(`The following packages will be installed in the local repository: ${specs.join(', ')}.`);
         const installResult = await this.repository.install(specs);
         const failToInstall = installResult.find(result => !result.path);
         if (failToInstall) {

package/dist/generator-lookup.js

@@ -39,7 +39,7 @@ export async function lookupGenerators(options = {}, register) {
         ...options,
     };
     return moduleLookupSync(options, ({ packagePath, files }) => {
-        files = [...files].sort((a, b) => {
+        files = [...files].toSorted((a, b) => {
             return defaultExtensions.indexOf(extname(a)) - defaultExtensions.indexOf(extname(b));
         });
         for (const filePath of files) {

package/dist/package-manager.d.ts

@@ -7,7 +7,7 @@ export type PackageManagerInstallTaskOptions = {
     packageJsonLocation: string;
     adapter: InputOutputAdapter;
     nodePackageManager?: string;
-    customInstallTask?: boolean | InstallTask;
+    customInstallTask?: boolean | InstallTask | 'ask';
     skipInstall?: boolean;
 };
 /**

package/dist/package-manager.js

@@ -23,7 +23,10 @@ export async function packageManagerInstallTask({ memFs, packageJsonLocation, cu
      * @return {Vinyl | undefined} a Vinyl file.
      */
     function getDestinationPackageJson() {
-        return memFs.get(join(packageJsonLocation, 'package.json'));
+        const packageJsonFile = join(packageJsonLocation, 'package.json');
+        if (memFs.existsInMemory(packageJsonFile)) {
+            return memFs.get(packageJsonFile);
+        }
     }
     /**
      * @private
@@ -32,12 +35,12 @@ export async function packageManagerInstallTask({ memFs, packageJsonLocation, cu
      */
     function isDestinationPackageJsonCommitted() {
         const file = getDestinationPackageJson();
-        return file.committed;
+        return file?.committed;
     }
     if (!getDestinationPackageJson()) {
         return false;
     }
-    if (customInstallTask && typeof customInstallTask !== 'function') {
+    if (customInstallTask && typeof customInstallTask !== 'function' && customInstallTask !== 'ask') {
         debug('Install disabled by customInstallTask');
         return false;
     }
@@ -68,8 +71,18 @@ Running ${packageManagerName} install for you to install the required dependenci
         await execa(packageManagerName, ['install'], { stdio: 'inherit', cwd: packageJsonLocation });
         return true;
     };
-    if (customInstallTask) {
+    if (typeof customInstallTask === 'function') {
         return customInstallTask(packageManagerName, execPackageManager);
     }
+    if (customInstallTask === 'ask') {
+        const { runInstall } = await adapter.prompt({
+            type: 'confirm',
+            name: 'runInstall',
+            message: `Do you want to run ${packageManagerName} install now?`,
+        });
+        if (!runInstall) {
+            return false;
+        }
+    }
     return execPackageManager();
 }

package/dist/util/namespace.js

@@ -39,7 +39,7 @@ export const asNamespace = (filepath, { lookups = defaultLookups }) => {
     // Sort lookups by length so biggest are removed first
     const nsLookups = [...lookups, '..']
         .map(found => slash(found))
-        .sort((a, b) => a.split('/').length - b.split('/').length)
+        .toSorted((a, b) => a.split('/').length - b.split('/').length)
         .toReversed();
     // If `ns` contains a lookup dir in its path, remove it.
     for (const lookup of nsLookups) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -16,7 +16,10 @@
     "app"
   ],
   "homepage": "http://yeoman.io",
-  "repository": "yeoman/environment",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yeoman/environment.git"
+  },
   "license": "BSD-2-Clause",
   "author": "Yeoman",
   "type": "module",
@@ -57,22 +60,22 @@
   },
   "dependencies": {
     "@yeoman/adapter": "^4.0.2",
-    "@yeoman/conflicter": "^4.0.1",
-    "@yeoman/namespace": "^1.0.1",
-    "@yeoman/transform": "^2.1.0",
-    "@yeoman/types": "^1.10.3",
+    "@yeoman/conflicter": "^4.1.0",
+    "@yeoman/namespace": "^2.1.0",
+    "@yeoman/transform": "^2.1.1",
+    "@yeoman/types": "^1.11.0",
     "arrify": "^3.0.0",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "debug": "^4.4.3",
     "execa": "^9.6.1",
     "fly-import": "^1.0.0",
-    "globby": "^16.1.1",
+    "globby": "^16.2.0",
     "grouped-queue": "^2.1.0",
     "locate-path": "^8.0.0",
-    "lodash-es": "^4.17.23",
-    "mem-fs": "^4.1.2",
-    "mem-fs-editor": "^12.0.2",
+    "lodash-es": "^4.18.1",
+    "mem-fs": "^4.1.4",
+    "mem-fs-editor": "^12.0.4",
     "semver": "^7.7.4",
     "slash": "^5.1.0",
     "untildify": "^6.0.0",
@@ -80,23 +83,23 @@
   },
   "devDependencies": {
     "@node-loaders/esbuild": "^2.0.0",
-    "@types/debug": "^4.1.12",
+    "@types/debug": "^4.1.13",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.19.35",
     "@types/semver": "^7.7.1",
-    "@yeoman/eslint": "1.0.0",
+    "@yeoman/eslint": "1.1.0",
     "c8": "^11.0.0",
-    "eslint": "9.39.3",
+    "eslint": "10.2.1",
     "esmocha": "^5.0.0",
-    "fs-extra": "^11.3.3",
+    "fs-extra": "^11.3.4",
     "jsdoc": "^4.0.5",
-    "prettier": "3.8.1",
-    "prettier-plugin-packagejson": "^3.0.0",
+    "prettier": "3.8.3",
+    "prettier-plugin-packagejson": "^3.0.2",
     "rimraf": "^6.1.3",
-    "sinon": "^21.0.1",
+    "sinon": "^21.1.2",
     "sinon-test": "^3.1.6",
     "strip-ansi": "^7.2.0",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "yeoman-assert": "^3.1.1",
     "yeoman-environment": "file:./",
     "yeoman-generator-2": "npm:yeoman-generator@^2.0.5",
@@ -105,7 +108,7 @@
     "yeoman-generator-6": "npm:yeoman-generator@^6.0.1",
     "yeoman-generator-7": "npm:yeoman-generator@^7.5.1",
     "yeoman-generator-8": "npm:yeoman-generator@^8.0.0-beta.8",
-    "yeoman-test": "^11.2.0"
+    "yeoman-test": "^11.3.1"
   },
   "peerDependencies": {
     "@yeoman/adapter": "^4.0.2",