yeoman-environment 4.0.0-alpha.8 → 4.0.0-beta.1

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

@@ -13,9 +13,9 @@ export declare class ComposedStore {
     getGenerators(): Record<string, BaseGenerator>;
     addGenerator(generator: any): {
         uniqueBy: any;
+        identifier: any;
         added: boolean;
         generator: BaseGenerator | undefined;
-        identifier?: undefined;
     } | {
         identifier: any;
         added: boolean;

package/dist/composed-store.js

@@ -1,5 +1,7 @@
 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;
@@ -41,7 +43,7 @@ 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) {
@@ -49,6 +51,7 @@ export class ComposedStore {
             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') {

package/dist/environment-base.js

@@ -526,11 +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 => {
+            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();
             });
@@ -567,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',
@@ -601,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

@@ -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

package/dist/util/namespace.js

@@ -1,7 +1,6 @@
 import { parse } from 'node:path';
 import slash from 'slash';
-import { findLast } from 'lodash-es';
-import escapeStringRegexp from 'escape-string-regexp';
+import { findLast, escapeRegExp } from 'lodash-es';
 export const defaultLookups = ['.', 'generators', 'lib/generators', 'dist/generators'];
 /**
  * Given a String `filepath`, tries to figure out the relative namespace.
@@ -45,7 +44,7 @@ export const asNamespace = (filepath, { lookups = defaultLookups }) => {
     // If `ns` contains a lookup dir in its path, remove it.
     for (const lookup of nsLookups) {
         // Only match full directory (begin with leading slash or start of input, end with trailing slash)
-        ns = ns.replace(new RegExp(`(?:/|^)${escapeStringRegexp(lookup)}(?=/)`, 'g'), '');
+        ns = ns.replace(new RegExp(`(?:/|^)${escapeRegExp(lookup)}(?=/)`, 'g'), '');
     }
     const folders = ns.split('/');
     const scope = findLast(folders, folder => folder.startsWith('@'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yeoman-environment",
-  "version": "4.0.0-alpha.8",
+  "version": "4.0.0-beta.1",
   "description": "Handles the lifecyle and bootstrapping of generators in a specific environment",
   "keywords": [
     "development",
@@ -65,21 +65,18 @@
     "chalk": "^5.2.0",
     "commander": "^10.0.1",
     "debug": "^4.3.4",
-    "escape-string-regexp": "^5.0.0",
     "execa": "^7.1.1",
-    "fly-import": "^0.2.0",
+    "fly-import": "^0.3.0",
     "globby": "^13.1.4",
     "grouped-queue": "^2.0.0",
     "locate-path": "^7.2.0",
     "lodash-es": "^4.17.21",
-    "log-symbols": "^5.1.0",
     "mem-fs": "^3.0.0",
     "mem-fs-editor": "^10.0.1",
-    "npmlog": "^7.0.1",
     "preferred-pm": "^3.0.3",
     "semver": "^7.5.0",
     "slash": "^5.0.1",
-    "untildify": "^4.0.0"
+    "untildify": "^5.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.8",
@@ -102,7 +99,7 @@
     "xo": "0.54.2",
     "yeoman-assert": "^3.1.1",
     "yeoman-generator": "^5.9.0",
-    "yeoman-test": "^8.0.0-rc.0"
+    "yeoman-test": "^8.0.0-rc.1"
   },
   "peerDependencies": {
     "@yeoman/types": "^1.0.1",