yeoman-environment 4.0.0-beta.1 → 4.0.0-beta.3

package/dist/composed-store.d.ts

@@ -4,14 +4,13 @@ export declare class ComposedStore {
     private readonly generators;
     private readonly uniqueByPathMap;
     private readonly uniqueGloballyMap;
-    private readonly uniqueFeatures;
     constructor({ log }?: {
         log?: Logger;
     });
-    get customCommitTask(): true | (() => Promise<void>) | undefined;
-    get customInstallTask(): true | (() => Promise<void>) | undefined;
+    get customCommitTask(): any;
+    get customInstallTask(): any;
     getGenerators(): Record<string, BaseGenerator>;
-    addGenerator(generator: any): {
+    addGenerator(generator: BaseGenerator): {
         uniqueBy: any;
         identifier: any;
         added: boolean;
@@ -19,8 +18,9 @@ export declare class ComposedStore {
     } | {
         identifier: any;
         added: boolean;
-        generator: any;
+        generator: BaseGenerator;
         uniqueBy?: undefined;
     };
     getUniqueByPathMap(root: string): Map<string, BaseGenerator>;
+    private getFeature;
 }

package/dist/composed-store.js

@@ -2,27 +2,25 @@ import crypto from 'node:crypto';
 import { toNamespace } from '@yeoman/namespace';
 import createdLogger from 'debug';
 const debug = createdLogger('yeoman:environment:composed-store');
-const uniqueFeatureValues = ['customCommitTask', 'customInstallTask'];
 export class ComposedStore {
     log;
     generators = {};
     uniqueByPathMap = new Map();
     uniqueGloballyMap = new Map();
-    uniqueFeatures = new Map();
     constructor({ log } = {}) {
         this.log = log;
     }
     get customCommitTask() {
-        return this.uniqueFeatures.get('customCommitTask');
+        return this.getFeature('customCommitTask');
     }
     get customInstallTask() {
-        return this.uniqueFeatures.get('customInstallTask');
+        return this.getFeature('customInstallTask');
     }
     getGenerators() {
         return { ...this.generators };
     }
     addGenerator(generator) {
-        const features = generator.getFeatures?.() ?? {};
+        const { features = generator.getFeatures?.() ?? {} } = generator;
         let { uniqueBy } = features;
         const { uniqueGlobally } = features;
         let identifier = uniqueBy;
@@ -46,19 +44,6 @@ export class ComposedStore {
             return { uniqueBy, identifier, added: false, generator: uniqueByMap.get(uniqueBy) };
         }
         uniqueByMap.set(uniqueBy, generator);
-        for (const featureName of uniqueFeatureValues) {
-            const feature = features[featureName];
-            if (feature) {
-                const existingFeature = this.uniqueFeatures.get(feature);
-                if (typeof existingFeature !== 'function') {
-                    debug(`Feature ${featureName} provided by ${uniqueBy}`);
-                    this.uniqueFeatures.set(featureName, feature);
-                }
-                else if (typeof feature === 'function') {
-                    this.log?.info?.(`Multiple ${featureName} tasks found. Using the first.`);
-                }
-            }
-        }
         this.generators[uniqueGlobally ? uniqueBy : `${generatorRoot}#${uniqueBy}`] = generator;
         return { identifier, added: true, generator };
     }
@@ -68,4 +53,22 @@ export class ComposedStore {
         }
         return this.uniqueByPathMap.get(root);
     }
+    getFeature(featureName) {
+        const providedFeatures = Object.entries(this.generators)
+            .map(([generatorId, generator]) => {
+            const { features = generator.getFeatures?.() } = generator;
+            const feature = features?.[featureName];
+            return feature ? [generatorId, feature] : undefined;
+        })
+            .filter(Boolean);
+        if (providedFeatures.length > 0) {
+            if (providedFeatures.length > 1) {
+                this.log?.info?.(`Multiple ${featureName} tasks found (${providedFeatures.map(([generatorId]) => generatorId).join(', ')}). Using the first.`);
+            }
+            const [generatorId, feature] = providedFeatures[0];
+            debug(`Feature ${featureName} provided by ${generatorId}`);
+            return feature;
+        }
+        return undefined;
+    }
 }

package/dist/environment-base.js

@@ -590,14 +590,14 @@ export default class EnvironmentBase extends EventEmitter {
      * Queue environment's package manager install task.
      */
     queuePackageManagerInstall() {
-        const { adapter, sharedFs: memFs } = this;
-        const { skipInstall, nodePackageManager } = this.options;
-        const { customInstallTask } = this.composedStore;
         this.queueTask('install', async () => {
             if (this.compatibilityMode === 'v4') {
                 debug('Running in generator < 5 compatibility. Package manager install is done by the generator.');
                 return;
             }
+            const { adapter, sharedFs: memFs } = this;
+            const { skipInstall, nodePackageManager } = this.options;
+            const { customInstallTask } = this.composedStore;
             await packageManagerInstallTask({
                 adapter,
                 memFs,

package/dist/package-manager.js

@@ -1,6 +1,6 @@
 import { join, resolve } from 'node:path';
 import createdLogger from 'debug';
-import preferredPm from 'preferred-pm';
+import { whichPackageManager } from 'which-package-manager';
 import { execa } from 'execa';
 const debug = createdLogger('yeoman:environment:package-manager');
 /**
@@ -53,8 +53,7 @@ Changes to package.json were detected.`);
 `);
         return false;
     }
-    // eslint-disable-next-line unicorn/no-await-expression-member
-    let packageManagerName = nodePackageManager ?? (await preferredPm(packageJsonLocation))?.name;
+    let packageManagerName = nodePackageManager ?? (await whichPackageManager({ cwd: packageJsonLocation }));
     const execPackageManager = async () => {
         if (!packageManagerName) {
             packageManagerName = 'npm';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.3",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -73,10 +73,10 @@
     "lodash-es": "^4.17.21",
     "mem-fs": "^3.0.0",
     "mem-fs-editor": "^10.0.1",
-    "preferred-pm": "^3.0.3",
     "semver": "^7.5.0",
     "slash": "^5.0.1",
-    "untildify": "^5.0.0"
+    "untildify": "^5.0.0",
+    "which-package-manager": "^0.0.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.8",