yeoman-environment 4.0.0-beta.0 → 4.0.0-beta.2

package/dist/commit.js

@@ -1,15 +1,18 @@
 import { createConflicterTransform, createYoResolveTransform, forceYoFiles } from '@yeoman/conflicter';
+import createdLogger from 'debug';
 import { create as createMemFsEditor } from 'mem-fs-editor';
 // eslint-disable-next-line n/file-extension-in-import
 import { isFilePending } from 'mem-fs-editor/state';
 // eslint-disable-next-line n/file-extension-in-import
 import { createCommitTransform } from 'mem-fs-editor/transform';
+const debug = createdLogger('yeoman:environment:commit');
 /**
  * Commits the MemFs to the disc.
  * @param {Stream} [stream] - files stream, defaults to this.sharedFs.stream().
  * @return {Promise}
  */
 export const commitSharedFsTask = ({ adapter, conflicterOptions, sharedFs, stream, }) => {
+    debug('Running commitSharedFsTask');
     const fs = createMemFsEditor(sharedFs);
     stream = stream ?? fs.store.stream({ filter: file => isFilePending(file) });
     return fs.commit([

package/dist/composed-store.d.ts

@@ -4,23 +4,23 @@ 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;
         generator: BaseGenerator | undefined;
-        identifier?: undefined;
     } | {
         identifier: any;
         added: boolean;
-        generator: any;
+        generator: BaseGenerator;
         uniqueBy?: undefined;
     };
     getUniqueByPathMap(root: string): Map<string, BaseGenerator>;
+    private getFeature;
 }

package/dist/composed-store.js

@@ -1,26 +1,26 @@
 import crypto from 'node:crypto';
 import { toNamespace } from '@yeoman/namespace';
-const uniqueFeatureValues = ['customCommitTask', 'customInstallTask'];
+import createdLogger from 'debug';
+const debug = createdLogger('yeoman:environment:composed-store');
 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;
@@ -41,21 +41,9 @@ export class ComposedStore {
         const generatorRoot = generator.destinationRoot();
         const uniqueByMap = uniqueGlobally ? this.uniqueGloballyMap : this.getUniqueByPathMap(generatorRoot);
         if (uniqueByMap.has(uniqueBy)) {
-            return { uniqueBy, added: false, generator: uniqueByMap.get(uniqueBy) };
+            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') {
-                    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 };
     }
@@ -65,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

@@ -526,12 +526,14 @@ export default class EnvironmentBase extends EventEmitter {
              * would be killed if an error is thrown to environment.
              * Make sure to not rely on that behavior.
              */
-            this.on('error', error => {
-                reject(error);
+            this.on('error', async (error) => {
                 this.runLoop.pause();
+                await this.adapter.onIdle?.();
+                reject(error);
                 this.adapter.close();
             });
-            this.once('end', () => {
+            this.once('end', async () => {
+                await this.adapter.onIdle?.();
                 resolve();
                 this.adapter.close();
             });
@@ -568,13 +570,15 @@ export default class EnvironmentBase extends EventEmitter {
         const queueCommit = () => {
             debug('Queueing conflicts task');
             this.queueTask('environment:conflicts', async () => {
+                debug('Running conflicts');
                 const { customCommitTask = () => commitSharedFsTask(this) } = this.composedStore;
-                if (typeof customCommitTask !== 'function') {
-                    // There is a custom commit task or just disabled
-                    return;
+                if (typeof customCommitTask === 'function') {
+                    await customCommitTask();
                 }
-                await customCommitTask();
-                debug('Adding queueCommit event listener');
+                else {
+                    debug('Ignoring commit, custom commit was provided');
+                }
+                debug('Adding queueCommit listener');
                 this.sharedFs.once('change', queueCommit);
             }, {
                 once: 'write memory fs to disk',
@@ -602,6 +606,10 @@ export default class EnvironmentBase extends EventEmitter {
                 nodePackageManager,
                 customInstallTask,
             });
+            memFs.once('change', file => {
+                if (file === join(this.cwd, 'package.json'))
+                    this.queuePackageManagerInstall();
+            });
         }, { once: 'package manager install' });
     }
     /**

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');
 /**
@@ -15,6 +15,7 @@ const debug = createdLogger('yeoman:environment:package-manager');
 
 */
 export async function packageManagerInstallTask({ memFs, packageJsonLocation, customInstallTask, adapter, nodePackageManager, skipInstall, }) {
+    debug('Running packageManagerInstallTask');
     packageJsonLocation = resolve(packageJsonLocation);
     /**
      * @private
@@ -52,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.0",
+  "version": "4.0.0-beta.2",
   "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",