@yeoman/conflicter 2.3.2 → 3.0.0

package/dist/conflicter.d.ts

@@ -1,12 +1,20 @@
-import type { InputOutputAdapter } from '@yeoman/types';
-import { type Change } from 'diff';
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import { Buffer } from 'node:buffer';
+import type { InputOutputAdapter } from '@yeoman/adapter/types';
+import type expand from '@inquirer/expand';
+import type { Separator } from '@inquirer/expand';
+import { type Change, DiffLinesOptionsNonabortable, DiffWordsOptionsNonabortable } from 'diff';
 import { type FileTransform } from 'mem-fs';
 import type { MemFsEditorFile } from 'mem-fs-editor';
 declare const statusToSkipFile: readonly ["skip", "diff", "ignore"];
 export type ConflicterLog = ['create', 'skip', 'identical', 'force', 'conflict'][number];
 export type ConflicterStatus = ConflicterLog | (typeof statusToSkipFile)[number];
-export type ConflicterAction = 'write' | 'abort' | 'diff' | 'reload' | 'force' | 'edit';
+export type ConflicterAction = 'write' | 'abort' | 'diff' | 'reload' | 'force' | 'edit' | 'ask' | 'skip' | 'ignore';
 export declare function setConflicterStatus<F extends ConflicterFile = ConflicterFile>(file: F, status?: ConflicterStatus): F;
+type ConflicterData = {
+    diskContents: Buffer;
+};
 export type ConflicterFile = MemFsEditorFile & {
     relativePath: string;
     conflicter?: ConflicterStatus;
@@ -14,19 +22,40 @@ export type ConflicterFile = MemFsEditorFile & {
     changesDetected?: boolean;
     binary?: boolean;
     conflicterChanges?: Change[];
+    conflicterData?: ConflicterData;
 };
 export type ConflictedFile = ConflicterFile & {
     conflicterChanges: Change[];
     changesDetected: true;
+    conflicterData: ConflicterData;
+};
+type ActionCallbackOptions = {
+    file: ConflicterFile | ConflictedFile;
+    relativeFilePath: string;
+    adapter: InputOutputAdapter;
 };
+type ValueActionCallback = (opt: ActionCallbackOptions) => ConflicterAction | Promise<ConflicterAction>;
+type ActionChoices = Parameters<typeof expand<ConflicterAction | ValueActionCallback>>[0]['choices'];
+type CustomizeActions = (actions: ActionChoices, options: {
+    separator?: (separator?: string) => Separator;
+}) => ActionChoices;
 export type ConflicterOptions = {
+    /** When set to true, we won't check for conflict. (the conflicter become a passthrough) */
     force?: boolean;
+    /** When set to true, we will abort on first conflict. (used for testing reproducibility) */
     bail?: boolean;
+    /** When set to true, whitespace changes should not generate a conflict. */
     ignoreWhitespace?: boolean;
+    /** When set to true, identical files should be written to disc. */
     regenerate?: boolean;
+    /** When set to true, no write operation will be executed. */
     dryRun?: boolean;
+    /** Path to be used as reference for relative path. */
     cwd?: string;
-    diffOptions?: any;
+    /** Custom diff options */
+    diffOptions?: DiffWordsOptionsNonabortable | DiffLinesOptionsNonabortable;
+    /** Customize file actions */
+    customizeActions?: CustomizeActions;
 };
 type ConflicterTransformOptions = {
     yoResolveFileName?: string;
@@ -38,19 +67,6 @@ type ConflicterTransformOptions = {
  *
  * When a potential conflict is detected, we prompt the user and ask them for
  * confirmation before proceeding with the actual write.
- *
- * @constructor
- * @property {Boolean} force - same as the constructor argument
- *
- * @param  {TerminalAdapter} adapter - The generator adapter
- * @param  {Object} options - Conflicter options
- * @param  {Boolean} [options.force=false] - When set to true, we won't check for conflict. (the conflicter become a passthrough)
- * @param  {Boolean} [options.bail=false] - When set to true, we will abort on first conflict. (used for testing reproducibility)
- * @param  {Boolean} [options.ignoreWhitespace=false] - When set to true, whitespace changes should not generate a conflict.
- * @param  {Boolean} [options.regenerate=false] - When set to true, identical files should be written to disc.
- * @param  {Boolean} [options.dryRun=false] - When set to true, no write operation will be executed.
- * @param  {Boolean} [options.cwd=process.cwd()] - Path to be used as reference for relative path.
- * @param  {string} cwd - Set cwd for relative logs.
  */
 export declare class Conflicter {
     private readonly adapter;
@@ -60,7 +76,8 @@ export declare class Conflicter {
     regenerate: boolean;
     dryRun: boolean;
     cwd: string;
-    diffOptions?: any;
+    diffOptions?: DiffWordsOptionsNonabortable | DiffLinesOptionsNonabortable;
+    customizeActions: CustomizeActions;
     constructor(adapter: InputOutputAdapter, options?: ConflicterOptions);
     private log;
     /**

package/dist/conflicter.js

@@ -31,19 +31,6 @@ const prepareChange = (changes, prefix) => changes
  *
  * When a potential conflict is detected, we prompt the user and ask them for
  * confirmation before proceeding with the actual write.
- *
- * @constructor
- * @property {Boolean} force - same as the constructor argument
- *
- * @param  {TerminalAdapter} adapter - The generator adapter
- * @param  {Object} options - Conflicter options
- * @param  {Boolean} [options.force=false] - When set to true, we won't check for conflict. (the conflicter become a passthrough)
- * @param  {Boolean} [options.bail=false] - When set to true, we will abort on first conflict. (used for testing reproducibility)
- * @param  {Boolean} [options.ignoreWhitespace=false] - When set to true, whitespace changes should not generate a conflict.
- * @param  {Boolean} [options.regenerate=false] - When set to true, identical files should be written to disc.
- * @param  {Boolean} [options.dryRun=false] - When set to true, no write operation will be executed.
- * @param  {Boolean} [options.cwd=process.cwd()] - Path to be used as reference for relative path.
- * @param  {string} cwd - Set cwd for relative logs.
  */
 export class Conflicter {
     adapter;
@@ -54,6 +41,7 @@ export class Conflicter {
     dryRun;
     cwd;
     diffOptions;
+    customizeActions;
     constructor(adapter, options) {
         this.adapter = adapter;
         this.force = options?.force ?? false;
@@ -63,6 +51,7 @@ export class Conflicter {
         this.dryRun = options?.dryRun ?? false;
         this.cwd = path.resolve(options?.cwd ?? process.cwd());
         this.diffOptions = options?.diffOptions;
+        this.customizeActions = options?.customizeActions ?? (actions => actions);
         if (this.bail) {
             // Bail conflicts with force option, if bail set force to false.
             this.force = false;
@@ -164,25 +153,26 @@ export class Conflicter {
         if (file.binary === undefined) {
             file.binary = isBinary(file.path, file.contents ?? undefined);
         }
-        const actual = await readFile(path.resolve(filepath));
+        const diskContents = await readFile(path.resolve(filepath));
         if (!Buffer.isBuffer(contents)) {
             contents = Buffer.from(contents ?? '', 'utf8');
         }
         if (file.binary) {
-            return Boolean(file.fileModeChanges) || actual.toString('hex') !== contents.toString('hex');
+            return Boolean(file.fileModeChanges) || diskContents.toString('hex') !== contents.toString('hex');
         }
         let modified;
         let changes;
         if (this.ignoreWhitespace) {
-            changes = diffWords(actual.toString(), contents.toString(), this.diffOptions);
+            changes = diffWords(diskContents.toString(), contents.toString(), this.diffOptions);
             modified = changes.some(change => change.value?.trim() && (change.added || change.removed));
         }
         else {
-            changes = diffLines(actual.toString(), contents.toString(), this.diffOptions);
+            changes = diffLines(diskContents.toString(), contents.toString(), this.diffOptions);
             modified = (changes && changes.length > 0 && (changes.length > 1 || changes[0].added || changes[0].removed)) ?? false;
         }
         if (modified) {
             file.conflicterChanges = changes;
+            file.conflicterData = { diskContents };
         }
         return Boolean(file.fileModeChanges) || modified;
     }
@@ -285,12 +275,13 @@ export class Conflicter {
         // Only offer diff option for files
         const fileStat = await fsStat(file.path);
         const message = `Overwrite ${file.relativePath}?`;
+        const { separator } = adapter;
         const result = await adapter.prompt([
             {
                 name: 'action',
                 type: 'expand',
                 message,
-                choices: [
+                choices: this.customizeActions([
                     {
                         key: 'y',
                         name: 'overwrite',
@@ -306,22 +297,27 @@ export class Conflicter {
                         name: 'overwrite this and all others',
                         value: 'force',
                     },
-                    {
-                        key: 'r',
-                        name: 'reload file (experimental)',
-                        value: 'reload',
-                    },
+                    ...(fileStat.isFile()
+                        ? [
+                            {
+                                key: 'd',
+                                name: 'show the differences between the old and the new',
+                                value: 'diff',
+                            },
+                        ]
+                        : []),
                     {
                         key: 'x',
                         name: 'abort',
                         value: 'abort',
                     },
+                    ...(separator ? [separator()] : []),
                     ...(fileStat.isFile()
                         ? [
                             {
-                                key: 'd',
-                                name: 'show the differences between the old and the new',
-                                value: 'diff',
+                                key: 'r',
+                                name: 'reload file (experimental)',
+                                value: 'reload',
                             },
                             {
                                 key: 'e',
@@ -335,17 +331,18 @@ export class Conflicter {
                             },
                         ]
                         : []),
-                ],
+                ], { separator }),
             },
         ]);
-        if (typeof result.action === 'function') {
-            return result.action.call(this, { file, relativeFilePath: file.relativePath, adapter });
+        let { action } = result;
+        if (typeof action === 'function') {
+            action = await action.call(this, { file, relativeFilePath: file.relativePath, adapter });
         }
-        if (result.action === 'abort') {
+        if (action === 'abort') {
             adapter.log.writeln('Aborting ...');
             throw new Error('Process aborted by user');
         }
-        if (result.action === 'diff') {
+        if (action === 'diff') {
             await this._printDiff({ file, adapter });
             counter++;
             if (counter === 5) {
@@ -353,19 +350,22 @@ export class Conflicter {
             }
             return this._ask({ file, counter, adapter });
         }
-        if (result.action === 'force') {
+        if (action === 'force') {
             this.force = true;
+            return 'force';
         }
-        if (result.action === 'write') {
+        if (action === 'write') {
             return 'force';
         }
-        if (result.action === 'reload') {
+        if (action === 'reload') {
             if (await this._detectConflict(file)) {
-                return this._ask({ file, counter, adapter });
+                action = 'ask';
+            }
+            else {
+                return 'identical';
             }
-            return 'identical';
         }
-        if (result.action === 'edit') {
+        if (action === 'edit') {
             const answers = await adapter.prompt([
                 {
                     name: 'content',
@@ -377,11 +377,19 @@ export class Conflicter {
             ]);
             file.contents = Buffer.from(answers.content ?? '', 'utf8');
             if (await this._detectConflict(file)) {
-                return this._ask({ file, counter, adapter });
+                action = 'ask';
+            }
+            else {
+                return 'skip';
             }
-            return 'skip';
         }
-        return result.action;
+        if (action === 'ask') {
+            return this._ask({ file, counter, adapter });
+        }
+        if (!['skip', 'ignore'].includes(action)) {
+            this.adapter.log.info(`Unknown conflicater action: ${result.action}`);
+        }
+        return action;
     }
     createTransform({ yoResolveFileName } = {}) {
         const yoResolveFilePath = path.resolve(this.cwd, yoResolveFileName ?? '.yo-resolve');

package/dist/conflicter.js.map

@@ -1 +1 @@
-{"version":3,"file":"conflicter.js","sourceRoot":"","sources":["../src/conflicter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conflicter.js","sourceRoot":"","sources":["../src/conflicter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeoman/conflicter",
-  "version": "2.3.2",
+  "version": "3.0.0",
   "private": false,
   "description": "Conflict resolution for yeoman's generator/environment stack",
   "keywords": [
@@ -32,25 +32,24 @@
     "test": "vitest run --coverage"
   },
   "dependencies": {
-    "@yeoman/transform": "^1.2.0",
-    "binary-extensions": "^2.3.0",
+    "@yeoman/transform": "^2.1.0",
+    "binary-extensions": "^3.1.0",
     "cli-table": "^0.3.11",
     "dateformat": "^5.0.3",
-    "diff": "^7.0.0",
-    "isbinaryfile": "^5.0.2",
-    "mem-fs-editor": "^11.1.2",
-    "minimatch": "^9.0.5",
-    "p-transform": "^4.1.6",
-    "pretty-bytes": "^6.1.1",
+    "diff": "^8.0.2",
+    "isbinaryfile": "^5.0.4",
+    "mem-fs-editor": "^11.1.4",
+    "minimatch": "^10.0.3",
+    "p-transform": "^5.0.1",
+    "pretty-bytes": "^7.0.1",
     "slash": "^5.1.0",
     "textextensions": "^6.11.0"
   },
   "devDependencies": {
     "@types/cli-table": "^0.3.4",
-    "@types/dateformat": "^5.0.2",
-    "@types/diff": "^6.0.0",
-    "@types/node": "^18.19.0",
-    "@types/textextensions": "^2.4.2",
+    "@types/dateformat": "^5.0.3",
+    "@types/node": "^20.14.8",
+    "@types/textextensions": "^5.0.0",
     "@yeoman/adapter": "*",
     "lodash-es": "^4.17.21"
   },
@@ -60,16 +59,16 @@
     "p-transform": "^5.0.1"
   },
   "peerDependencies": {
-    "@types/node": ">=18.12.0",
+    "@types/node": ">=20.14.8",
     "@yeoman/types": "^1.0.0",
     "mem-fs": "^4.0.0"
   },
   "engines": {
-    "node": ">=18.12.0"
+    "node": "20 || >=22"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "3b77ad9325d6ab8cb4bcb2d42580ed7988b552bb"
+  "gitHead": "ccc7a0768ca1d138fa9f44a0d12604bc0321a690"
 }