@yeoman/conflicter 0.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 The Yeoman Team <admin@simonboudrias.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/README.md

@@ -0,0 +1,21 @@
+# @yeoman/namespace
+
+[![NPM version][npm-image]][npm-url]
+[![NPM Test](https://github.com/yeoman/yeoman-api/workflows/NPM%20Test/badge.svg)](https://github.com/yeoman/yeoman-api/actions?query=workflow%3A%22NPM+Test%22)
+[![Integration Build](https://github.com/yeoman/yeoman-api/workflows/Integration%20Build/badge.svg)](https://github.com/yeoman/yeoman-api/actions?query=workflow%3A%22Integration+Build%22)
+[![Dependency Status][daviddm-image]][daviddm-url]
+
+> Common API for yeoman's generator/environment stack
+
+Intended for internal yeoman generator/environment stack use.
+
+## License
+
+MIT © [The Yeoman Team](http://yeoman.io)
+
+[npm-image]: https://badge.fury.io/js/yeoman-api.svg
+[npm-url]: https://npmjs.org/package/yeoman-api
+[travis-image]: https://travis-ci.org/yeoman/yeoman-api.svg?branch=master
+[travis-url]: https://travis-ci.org/yeoman/yeoman-api
+[daviddm-image]: https://david-dm.org/yeoman/yeoman-api.svg?theme=shields.io
+[daviddm-url]: https://david-dm.org/yeoman/yeoman-api

package/dist/binary-diff.d.ts

@@ -0,0 +1,4 @@
+import { Buffer } from 'node:buffer';
+declare const isBinary: (filePath: string, newFileContents?: Buffer | string) => boolean;
+declare const binaryDiff: (existingFilePath: string, newFileContents?: Buffer) => string;
+export { isBinary, binaryDiff };

package/dist/binary-diff.js

@@ -0,0 +1,38 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { Buffer } from 'node:buffer';
+import Table from 'cli-table';
+import dateFormat from 'dateformat';
+import prettyBytes from 'pretty-bytes';
+import { isBinaryFileSync } from 'isbinaryfile';
+import textextensions from 'textextensions';
+import binaryExtensions from 'binary-extensions';
+const isBinary = (filePath, newFileContents) => {
+    const extension = path.extname(filePath).replace(/^\./, '') || path.basename(filePath);
+    if (binaryExtensions.includes(extension)) {
+        return true;
+    }
+    if (textextensions.includes(extension)) {
+        return false;
+    }
+    return Boolean((fs.existsSync(filePath) && isBinaryFileSync(filePath)) ||
+        (newFileContents && isBinaryFileSync(Buffer.isBuffer(newFileContents) ? newFileContents : Buffer.from(newFileContents))));
+};
+const binaryDiff = (existingFilePath, newFileContents) => {
+    const existingStat = fs.statSync(existingFilePath);
+    const table = new Table({
+        head: ['', 'Existing', 'Replacement', 'Diff'],
+    });
+    let sizeDiff;
+    if (!newFileContents) {
+        newFileContents = Buffer.from([]);
+    }
+    sizeDiff = existingStat.size > newFileContents.length ? '-' : '+';
+    sizeDiff += prettyBytes(Math.abs(existingStat.size - newFileContents.length));
+    table.push(['Size', prettyBytes(existingStat.size), prettyBytes(newFileContents.length), sizeDiff], 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    ['Last modified', dateFormat(existingStat.mtime), '', '']);
+    return table.toString();
+};
+export { isBinary, binaryDiff };
+//# sourceMappingURL=binary-diff.js.map

package/dist/binary-diff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"binary-diff.js","sourceRoot":"","sources":["../src/binary-diff.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,MAAM,WAAW,CAAC;AAC9B,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,WAAW,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,mBAAmB,CAAC;AAEjD,MAAM,QAAQ,GAAG,CAAC,QAAgB,EAAE,eAAiC,EAAW,EAAE;IAChF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACvF,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACxC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QACtC,OAAO,KAAK,CAAC;KACd;IAED,OAAO,OAAO,CACZ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACrD,CAAC,eAAe,IAAI,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAC3H,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,gBAAwB,EAAE,eAAwB,EAAE,EAAE;IACxE,MAAM,YAAY,GAAG,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,IAAI,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,CAAC;KAC9C,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC;IAEb,IAAI,CAAC,eAAe,EAAE;QACpB,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACnC;IAED,QAAQ,GAAG,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IAElE,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAE9E,KAAK,CAAC,IAAI,CACR,CAAC,MAAM,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC;IACvF,6DAA6D;IAC7D,CAAC,eAAe,EAAG,UAAkB,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CACnE,CAAC;IAEF,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC"}

package/dist/conflicter.d.ts

@@ -0,0 +1,112 @@
+import type { InputOutputAdapter } from '@yeoman/types';
+import { type Change } from 'diff';
+import type { Store } from 'mem-fs';
+import { type MemFsEditor, type MemFsEditorFile } from 'mem-fs-editor';
+export type ConflicterStatus = 'create' | 'skip' | 'identical' | 'force';
+export type ConflicterLog = ConflicterStatus | 'conflict';
+export type ConflicterAction = 'write' | 'abort' | 'diff' | 'reload' | 'force' | 'edit';
+export type ConflicterStreamStatus = {
+    force: boolean;
+};
+export type ConflicterFile = MemFsEditorFile & {
+    conflicterLog?: ConflicterLog;
+    conflicter?: ConflicterStatus;
+    binary?: boolean;
+    conflicterChanges?: Change[];
+};
+export type ConflictedFile = ConflicterFile & {
+    conflicterChanges: Change[];
+};
+export type ConflicterOptions = {
+    memFs?: Store;
+    force?: boolean;
+    bail?: boolean;
+    ignoreWhitespace?: boolean;
+    regenerate?: boolean;
+    dryRun?: boolean;
+    cwd?: string;
+    diffOptions?: any;
+};
+/**
+ * The Conflicter is a module that can be used to detect conflict between files. Each
+ * Generator file system helpers pass files through this module to make sure they don't
+ * break a user file.
+ *
+ * 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;
+    force: boolean;
+    bail: boolean;
+    ignoreWhitespace: boolean;
+    regenerate: boolean;
+    dryRun: boolean;
+    cwd: string;
+    diffOptions?: any;
+    fs?: MemFsEditor<ConflicterFile>;
+    constructor(adapter: InputOutputAdapter, options?: ConflicterOptions);
+    log(file: ConflicterFile): void;
+    _log(logStatus: ConflicterLog | 'writeln' | undefined, ...args: any[]): void;
+    /**
+     * Print the file differences to console
+     *
+     * @param  {Object}   file File object respecting this interface: { path, contents }
+     */
+    _printDiff({ file, adapter }: {
+        file: ConflictedFile;
+        adapter?: InputOutputAdapter;
+    }): Promise<void>;
+    /**
+     * Detect conflicts between file contents at `filepath` with the `contents` passed to the
+     * function
+     *
+     * If `filepath` points to a folder, we'll always return true.
+     *
+     * Based on detect-conflict module
+     *
+     * @param  {import('vinyl')} file File object respecting this interface: { path, contents }
+     * @return {Boolean} `true` if there's a conflict, `false` otherwise.
+     */
+    _detectConflict(file: ConflicterFile): Promise<boolean>;
+    /**
+     * Check if a file conflict with the current version on the user disk
+     *
+     * A basic check is done to see if the file exists, if it does:
+     *
+     *   1. Read its content from  `fs`
+     *   2. Compare it with the provided content
+     *   3. If identical, mark it as is and skip the check
+     *   4. If diverged, prepare and show up the file collision menu
+     *
+     * @param {import('vinyl')} file - Vinyl file
+     * @param {Object} [conflicterStatus] - Conflicter status
+     * @return  {Promise<Vinyl>} Promise the Vinyl file
+     */
+    checkForCollision(file: ConflicterFile, conflicterStatus?: ConflicterStreamStatus): Promise<ConflicterFile>;
+    /**
+     * Actual prompting logic
+     * @private
+     * @param {import('vinyl')} file vinyl file object
+     * @param {Number} counter prompts
+     */
+    _ask({ file, counter, conflicterStatus, adapter, }: {
+        file: ConflictedFile;
+        counter: number;
+        conflicterStatus: ConflicterStreamStatus;
+        adapter: InputOutputAdapter;
+    }): Promise<ConflicterStatus>;
+}

package/dist/conflicter.js

@@ -0,0 +1,371 @@
+import fs from 'node:fs';
+import { stat as fsStat, readFile } from 'node:fs/promises';
+import path from 'node:path';
+import process from 'node:process';
+import { Buffer } from 'node:buffer';
+import { diffWords, diffLines } from 'diff';
+import { create as createMemFsEditor } from 'mem-fs-editor';
+import { binaryDiff, isBinary } from './binary-diff.js';
+/**
+ * The Conflicter is a module that can be used to detect conflict between files. Each
+ * Generator file system helpers pass files through this module to make sure they don't
+ * break a user file.
+ *
+ * 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;
+    force;
+    bail;
+    ignoreWhitespace;
+    regenerate;
+    dryRun;
+    cwd;
+    diffOptions;
+    fs;
+    constructor(adapter, options) {
+        this.adapter = adapter;
+        this.fs = createMemFsEditor(options?.memFs);
+        this.force = options?.force ?? false;
+        this.bail = options?.bail ?? false;
+        this.ignoreWhitespace = options?.ignoreWhitespace ?? false;
+        this.regenerate = options?.regenerate ?? false;
+        this.dryRun = options?.dryRun ?? false;
+        this.cwd = path.resolve(options?.cwd ?? process.cwd());
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        this.diffOptions = options?.diffOptions;
+        if (this.bail) {
+            // Bail conflicts with force option, if bail set force to false.
+            this.force = false;
+        }
+    }
+    log(file) {
+        const logStatus = file.conflicterLog ?? file.conflicter;
+        this._log(logStatus, path.relative(this.cwd, file.path));
+    }
+    _log(logStatus, ...args) {
+        if (logStatus && this.adapter.log[logStatus]) {
+            this.adapter.log[logStatus](...args);
+        }
+    }
+    /**
+     * Print the file differences to console
+     *
+     * @param  {Object}   file File object respecting this interface: { path, contents }
+     */
+    async _printDiff({ file, adapter }) {
+        const destAdapter = adapter ?? this.adapter;
+        if (file.binary === undefined) {
+            file.binary = isBinary(file.path, file.contents ?? undefined);
+        }
+        if (file.binary) {
+            destAdapter.log.writeln(binaryDiff(file.path, file.contents ?? undefined));
+            return;
+        }
+        const colorLines = (colored) => {
+            if (colored.color) {
+                const lines = colored.message.split('\n');
+                const returnValue = [];
+                for (const [idx, message] of lines.entries()) {
+                    // Empty message can be ignored
+                    if (message) {
+                        returnValue.push({ message, color: colored.color });
+                    }
+                    if (lines.length > idx) {
+                        returnValue.push({ message: '\n' });
+                    }
+                }
+                return returnValue;
+            }
+            return [colored];
+        };
+        const messages = file.conflicterChanges
+            ?.map((change) => {
+            if (change.added) {
+                return { color: 'added', message: change.value };
+            }
+            if (change.removed) {
+                return { color: 'removed', message: change.value };
+            }
+            return { message: change.value };
+        })
+            .map((colored) => colorLines(colored));
+        destAdapter.log.colored([
+            { message: '\n' },
+            { message: 'removed', color: 'removed' },
+            { message: '' },
+            { message: 'added', color: 'added' },
+            { message: '\n\n' },
+            ...messages.flat(),
+            { message: '\n\n' },
+        ]);
+    }
+    /**
+     * Detect conflicts between file contents at `filepath` with the `contents` passed to the
+     * function
+     *
+     * If `filepath` points to a folder, we'll always return true.
+     *
+     * Based on detect-conflict module
+     *
+     * @param  {import('vinyl')} file File object respecting this interface: { path, contents }
+     * @return {Boolean} `true` if there's a conflict, `false` otherwise.
+     */
+    async _detectConflict(file) {
+        let { contents, stat } = file;
+        const filepath = path.resolve(file.path);
+        // If file path point to a directory, then it's not safe to write
+        const diskStat = await fsStat(filepath);
+        if (diskStat.isDirectory()) {
+            return true;
+        }
+        if (stat?.mode && diskStat.mode !== stat.mode) {
+            return true;
+        }
+        if (file.binary === undefined) {
+            file.binary = isBinary(file.path, file.contents ?? undefined);
+        }
+        const actual = await readFile(path.resolve(filepath));
+        if (!Buffer.isBuffer(contents)) {
+            contents = Buffer.from(contents ?? '', 'utf8');
+        }
+        if (file.binary) {
+            return actual.toString('hex') !== contents.toString('hex');
+        }
+        let modified;
+        let changes;
+        if (this.ignoreWhitespace) {
+            changes = diffWords(actual.toString(), contents.toString(), this.diffOptions);
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            modified = changes.some(change => change.value?.trim() && (change.added || change.removed));
+        }
+        else {
+            changes = diffLines(actual.toString(), contents.toString(), this.diffOptions);
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            modified = (changes.length > 1 || changes[0].added || changes[0].removed) ?? false;
+        }
+        file.conflicterChanges = changes;
+        return modified;
+    }
+    /**
+     * Check if a file conflict with the current version on the user disk
+     *
+     * A basic check is done to see if the file exists, if it does:
+     *
+     *   1. Read its content from  `fs`
+     *   2. Compare it with the provided content
+     *   3. If identical, mark it as is and skip the check
+     *   4. If diverged, prepare and show up the file collision menu
+     *
+     * @param {import('vinyl')} file - Vinyl file
+     * @param {Object} [conflicterStatus] - Conflicter status
+     * @return  {Promise<Vinyl>} Promise the Vinyl file
+     */
+    // eslint-disable-next-line unicorn/no-object-as-default-parameter
+    async checkForCollision(file, conflicterStatus = { force: false }) {
+        const rfilepath = path.relative(this.cwd, file.path);
+        if (file.conflicter) {
+            this._log(file.conflicter, rfilepath);
+            return file;
+        }
+        if (!fs.existsSync(file.path)) {
+            if (this.bail) {
+                this._log('writeln', 'Aborting ...');
+                throw new Error(`Process aborted by conflict: ${rfilepath}`);
+            }
+            this._log('create', rfilepath);
+            file.conflicter = this.dryRun ? 'skip' : 'create';
+            file.conflicterLog = 'create';
+            return file;
+        }
+        const isForce = () => this.force || conflicterStatus?.force;
+        if (isForce()) {
+            this._log('force', rfilepath);
+            file.conflicter = 'force';
+            return file;
+        }
+        if (await this._detectConflict(file)) {
+            const conflictedFile = file;
+            if (this.bail) {
+                this.adapter.log.conflict(rfilepath);
+                await this._printDiff({ file: conflictedFile });
+                this.adapter.log.writeln('Aborting ...');
+                const error = new Error(`Process aborted by conflict: ${rfilepath}`);
+                error.file = file;
+                throw error;
+            }
+            if (this.dryRun) {
+                this._log('conflict', rfilepath);
+                await this._printDiff({ file: conflictedFile });
+                file.conflicter = 'skip';
+                file.conflicterLog = 'conflict';
+                return file;
+            }
+            if (isForce()) {
+                file.conflicter = 'force';
+                this.adapter.log.force(rfilepath);
+                return file;
+            }
+            const ask = async (adapter) => {
+                adapter.log.conflict(rfilepath);
+                const action = await this._ask({ file: conflictedFile, counter: 1, conflicterStatus, adapter });
+                adapter.log[action ?? 'force'](rfilepath);
+                file.conflicter = action;
+                return file;
+            };
+            if (this.adapter.queue) {
+                const file = await this.adapter.queue(ask);
+                if (!file) {
+                    throw new Error('A conflicter file was not returned');
+                }
+                return file;
+            }
+            return ask(this.adapter);
+        }
+        this._log('identical', rfilepath);
+        if (!this.regenerate) {
+            file.conflicter = 'skip';
+            file.conflicterLog = 'identical';
+            return file;
+        }
+        file.conflicter = 'identical';
+        return file;
+    }
+    /**
+     * Actual prompting logic
+     * @private
+     * @param {import('vinyl')} file vinyl file object
+     * @param {Number} counter prompts
+     */
+    async _ask({ file, counter, conflicterStatus, adapter, }) {
+        if (file.conflicter) {
+            return file.conflicter;
+        }
+        const rfilepath = path.relative(this.cwd, file.path);
+        const prompt = {
+            name: 'action',
+            type: 'expand',
+            message: `Overwrite ${rfilepath}?`,
+            pageSize: 20,
+            choices: [
+                {
+                    key: 'y',
+                    name: 'overwrite',
+                    value: 'write',
+                },
+                {
+                    key: 'n',
+                    name: 'do not overwrite',
+                    value: 'skip',
+                },
+                {
+                    key: 'a',
+                    name: 'overwrite this and all others',
+                    value: 'force',
+                },
+                {
+                    key: 'r',
+                    name: 'reload file (experimental)',
+                    value: 'reload',
+                },
+                {
+                    key: 'x',
+                    name: 'abort',
+                    value: 'abort',
+                },
+            ],
+        };
+        // Only offer diff option for files
+        const fileStat = await fsStat(file.path);
+        if (fileStat.isFile()) {
+            prompt.choices.push({
+                key: 'd',
+                name: 'show the differences between the old and the new',
+                value: 'diff',
+            }, {
+                key: 'e',
+                name: 'edit file (experimental)',
+                value: 'edit',
+            });
+            if (this.fs) {
+                prompt.choices.push({
+                    key: 'i',
+                    name: 'ignore, do not overwrite and remember (experimental)',
+                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                    // @ts-expect-error
+                    value: ({ relativeFilePath }) => {
+                        this.fs.append(`${this.cwd}/.yo-resolve`, `${relativeFilePath} skip`, { create: true });
+                        return 'skip';
+                    },
+                });
+            }
+        }
+        const result = await adapter.prompt([
+            prompt,
+        ]);
+        if (typeof result.action === 'function') {
+            return result.action.call(this, { file, relativeFilePath: rfilepath, adapter });
+        }
+        if (result.action === 'abort') {
+            adapter.log.writeln('Aborting ...');
+            throw new Error('Process aborted by user');
+        }
+        if (result.action === 'diff') {
+            await this._printDiff({ file, adapter });
+            counter++;
+            if (counter === 5) {
+                throw new Error(`Recursive error ${prompt.message}`);
+            }
+            return this._ask({ file, counter, conflicterStatus, adapter });
+        }
+        if (result.action === 'force') {
+            if (conflicterStatus) {
+                conflicterStatus.force = true;
+            }
+            else {
+                this.force = true;
+            }
+        }
+        if (result.action === 'write') {
+            return 'force';
+        }
+        if (result.action === 'reload') {
+            if (await this._detectConflict(file)) {
+                return this._ask({ file, counter, conflicterStatus, adapter });
+            }
+            return 'identical';
+        }
+        if (result.action === 'edit') {
+            const answers = await adapter.prompt([
+                {
+                    name: 'content',
+                    type: 'editor',
+                    default: file.contents?.toString(),
+                    postfix: `.${path.extname(file.path)}`,
+                    message: `Edit ${rfilepath}`,
+                },
+            ]);
+            file.contents = Buffer.from(answers.content ?? '', 'utf8');
+            if (await this._detectConflict(file)) {
+                return this._ask({ file, counter, conflicterStatus, adapter });
+            }
+            return 'skip';
+        }
+        return result.action;
+    }
+}
+//# sourceMappingURL=conflicter.js.map

package/dist/conflicter.js.map

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

package/package.json

@@ -0,0 +1,67 @@
+{
+  "name": "@yeoman/conflicter",
+  "version": "0.1.0",
+  "private": false,
+  "description": "Conflict resolution for yeoman's generator/environment stack",
+  "keywords": [
+    "yeoman",
+    "api"
+  ],
+  "homepage": "http://yeoman.io",
+  "repository": "yeoman/yeoman-api",
+  "license": "MIT",
+  "author": "The Yeoman Team",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "prebuild": "npm run clean",
+    "build": "tsc",
+    "clean": "rimraf dist",
+    "clean-all": "npm run clean && rimraf node_modules",
+    "precommit": "lint-staged",
+    "pretest": "xo",
+    "test": "c8 esmocha --forbid-only"
+  },
+  "dependencies": {
+    "@yeoman/types": "^0.2.0",
+    "binary-extensions": "^2.2.0",
+    "cli-table": "^0.3.11",
+    "dateformat": "^5.0.3",
+    "diff": "^5.1.0",
+    "isbinaryfile": "^5.0.0",
+    "mem-fs": "^3.0.0",
+    "mem-fs-editor": "^10.0.2",
+    "pretty-bytes": "^6.1.0",
+    "textextensions": "^5.16.0"
+  },
+  "devDependencies": {
+    "@types/cli-table": "^0.3.1",
+    "@types/dateformat": "^5.0.0",
+    "@types/diff": "^5.0.3",
+    "@types/textextensions": "^2.4.0",
+    "@yeoman/adapter": "^0.1.0",
+    "esmocha": "^0.1.4",
+    "lodash-es": "^4.17.21",
+    "sinon": "^15.0.4",
+    "slash": "^5.1.0",
+    "yeoman-test": "^8.0.0-beta.0"
+  },
+  "engines": {
+    "node": "^16.13.0 || >=18.12.0"
+  },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "gitHead": "1982816cfe6af4e92f999e344cf9b8539ff308eb"
+}