npm - @yeoman/conflicter - Versions diffs - 2.0.0 → 2.2.0 - Mend

@yeoman/conflicter 2.0.0 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist/binary-diff.js CHANGED Viewed

@@ -24,14 +24,10 @@ const binaryDiff = (existingFilePath, newFileContents) => {
         head: ['', 'Existing', 'Replacement', 'Diff'],
     });
     let sizeDiff;
-    if (!newFileContents) {
-        newFileContents = Buffer.from([]);
-    }
+    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), '', '']);
+    table.push(['Size', prettyBytes(existingStat.size), prettyBytes(newFileContents.length), sizeDiff], ['Last modified', dateFormat(existingStat.mtime), '', '']);
     return table.toString();
 };
 export { isBinary, binaryDiff };

package/dist/binary-diff.js.map CHANGED Viewed

	@@ -1 +1 @@
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"}
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,eAAe,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEpC,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,EACvF,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.js CHANGED Viewed

@@ -1,12 +1,10 @@
-/* eslint-disable @typescript-eslint/member-ordering */
 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 { diffLines, diffWords } from 'diff';
 import { loadFile } from 'mem-fs';
-// eslint-disable-next-line n/file-extension-in-import
 import { clearFileState, setModifiedFileState } from 'mem-fs-editor/state';
 import { transform } from 'p-transform';
 import { binaryDiff, isBinary } from './binary-diff.js';
@@ -14,6 +12,10 @@ export function setConflicterStatus(file, status) {
     file.conflicter = status;
     return file;
 }
+const prepareChange = (changes, prefix) => changes
+    .split('\n')
+    .map((line, index, array) => (array.length - 1 === index ? line : `${prefix}${line}`))
+    .join('\n');
 /**
  * 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
@@ -52,7 +54,6 @@ export class Conflicter {
         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.
@@ -72,24 +73,24 @@ export class Conflicter {
      * @param  {Object}   file File object respecting this interface: { path, contents }
      */
     async _printDiff({ file, adapter }) {
-        const destAdapter = adapter ?? this.adapter;
+        const destinationAdapter = 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));
+            destinationAdapter.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()) {
+                for (const [index, message] of lines.entries()) {
                     // Empty message can be ignored
                     if (message) {
                         returnValue.push({ message, color: colored.color });
                     }
-                    if (idx + 1 < lines.length) {
+                    if (index + 1 < lines.length) {
                         returnValue.push({ message: '\n' });
                     }
                 }
@@ -97,10 +98,6 @@ export class Conflicter {
             }
             return [colored];
         };
-        const prepareChange = (changes, prefix) => changes
-            .split('\n')
-            .map((line, index, array) => (array.length - 1 === index ? line : `${prefix}${line}`))
-            .join('\n');
         const messages = file.conflicterChanges
             ?.map((change) => {
             if (change.added) {
@@ -113,14 +110,14 @@ export class Conflicter {
         })
             .map((colored) => colorLines(colored));
         if (file.fileModeChanges) {
-            destAdapter.log.colored([
+            destinationAdapter.log.colored([
                 { message: `\nold mode ${file.fileModeChanges[0]}`, color: 'removed' },
                 { message: `\nnew mode ${file.fileModeChanges[1]}`, color: 'added' },
                 { message: '\n' },
             ]);
         }
         if (messages) {
-            destAdapter.log.colored([
+            destinationAdapter.log.colored([
                 { message: '\n' },
                 { message: 'removed', color: 'removed' },
                 { message: '' },
@@ -143,7 +140,8 @@ export class Conflicter {
      * @return {Boolean} `true` if there's a conflict, `false` otherwise.
      */
     async _detectConflict(file) {
-        let { contents, stat } = file;
+        let { contents } = file;
+        const { 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);
@@ -167,12 +165,10 @@ export class Conflicter {
         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;
         }
         if (modified) {
@@ -276,58 +272,61 @@ export class Conflicter {
      * @param {Number} counter prompts
      */
     async _ask({ file, counter, adapter, }) {
-        const prompt = {
-            name: 'action',
-            type: 'expand',
-            message: `Overwrite ${file.relativePath}?`,
-            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',
-            }, {
-                key: 'i',
-                name: 'ignore, do not overwrite and remember (experimental)',
-                value: 'ignore',
-            });
-        }
+        const message = `Overwrite ${file.relativePath}?`;
         const result = await adapter.prompt([
-            prompt,
+            {
+                name: 'action',
+                type: 'expand',
+                message,
+                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',
+                    },
+                    ...(fileStat.isFile()
+                        ? []
+                        : [
+                            {
+                                key: 'd',
+                                name: 'show the differences between the old and the new',
+                                value: 'diff',
+                            },
+                            {
+                                key: 'e',
+                                name: 'edit file (experimental)',
+                                value: 'edit',
+                            },
+                            {
+                                key: 'i',
+                                name: 'ignore, do not overwrite and remember (experimental)',
+                                value: 'ignore',
+                            },
+                        ]),
+                ],
+            },
         ]);
         if (typeof result.action === 'function') {
             return result.action.call(this, { file, relativeFilePath: file.relativePath, adapter });
@@ -340,7 +339,7 @@ export class Conflicter {
             await this._printDiff({ file, adapter });
             counter++;
             if (counter === 5) {
-                throw new Error(`Recursive error ${prompt.message}`);
+                throw new Error(`Recursive error ${message}`);
             }
             return this._ask({ file, counter, adapter });
         }
@@ -395,12 +394,12 @@ export class Conflicter {
             }
             if (file.path === yoResolveFilePath) {
                 yoResolveFile = file;
-                return undefined;
+                return;
             }
             return conflicterFile;
         }, function () {
             if (yoResolveContents) {
-                yoResolveFile = yoResolveFile ?? loadFile(yoResolveFilePath);
+                yoResolveFile ??= loadFile(yoResolveFilePath);
                 setModifiedFileState(yoResolveFile);
                 const oldContents = yoResolveFile.contents?.toString() ?? '';
                 yoResolveFile.contents = Buffer.from(oldContents + yoResolveContents);

package/dist/conflicter.js.map CHANGED Viewed

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

package/dist/transform.js CHANGED Viewed

@@ -1,5 +1,4 @@
 import { transformFileField } from '@yeoman/transform';
-// eslint-disable-next-line n/file-extension-in-import
 import { isFilePending } from 'mem-fs-editor/state';
 export const forceFileTransform = (pattern) => transformFileField('conflicter', 'force', { pattern, filter: isFilePending });
 export const forceYoFiles = () => forceFileTransform('**/{.yo-rc.json,.yo-resolve,.yo-rc-global.json}');

package/dist/transform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,~~sDAAsD;AACtD,~~OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAkC,EAAE,CACpF,kBAAkB,CAA+B,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG,GAAmC,EAAE,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAAC"}
1	+ {"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,OAAe,EAAkC,EAAE,CACpF,kBAAkB,CAA+B,YAAY,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG,GAAmC,EAAE,CAAC,kBAAkB,CAAC,iDAAiD,CAAC,CAAC"}

package/dist/yo-resolve.js CHANGED Viewed

@@ -3,7 +3,6 @@ import { dirname, resolve } from 'node:path';
 import { Minimatch } from 'minimatch';
 import slash from 'slash';
 import { transformFileField } from '@yeoman/transform';
-// eslint-disable-next-line n/file-extension-in-import
 import { isFilePending } from 'mem-fs-editor/state';
 const eachFolder = function* (folder) {
     let last;
@@ -21,11 +20,9 @@ export class YoResolve {
     }
     async getStatusForFile(filePath) {
         for (const folder of eachFolder(slash(filePath))) {
-            // eslint-disable-next-line no-await-in-loop
             const map = await this.getMapForFolder(folder);
             if (map) {
                 for (const [pattern, value] of map) {
-                    // eslint-disable-next-line unicorn/prefer-regexp-test
                     if (pattern.match(filePath)) {
                         return value;
                     }
@@ -39,7 +36,6 @@ export class YoResolve {
     }
     async getMapForFolder(folder) {
         const map = this.groupedYoResolve.get(folder);
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (map || map === null) {
             return map ?? undefined;
         }
@@ -67,9 +63,11 @@ export class YoResolve {
                 return map;
             }
         }
-        catch { }
+        catch {
+            // Ignore errors
+        }
         return undefined;
     }
 }
-export const createYoResolveTransform = (...args) => new YoResolve(...args).createTransform();
+export const createYoResolveTransform = (...arguments_) => new YoResolve(...arguments_).createTransform();
 //# sourceMappingURL=yo-resolve.js.map

package/dist/yo-resolve.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"yo-resolve.js","sourceRoot":"","sources":["../src/yo-resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAGvD,~~sDAAsD;AACtD,~~OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGpD,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,MAAc;IAC1C,IAAI,IAAI,CAAC;IACT,GAAG;QACD,MAAM,MAAM,CAAC;QACb,IAAI,GAAG,MAAM,CAAC;QACd,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAC1B,QAAQ,MAAM,KAAK,IAAI,EAAE;AAC5B,CAAC,CAAC;AAEF,MAAM,OAAO,SAAS;IACpB,gBAAgB,GAAG,IAAI,GAAG,EAAkC,CAAC;IACpD,iBAAiB,CAAS;IAEnC,YAAY,OAAwC;QAClD,IAAI,CAAC,iBAAiB,GAAG,OAAO,EAAE,iBAAiB,IAAI,aAAa,CAAC;IACvE,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QACrC,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE;YAChD,~~4CAA4C;YAC5C,~~MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,GAAG,EAAE;gBACP,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,GAAG,EAAE;oBAClC,~~sDAAsD;oBACtD,~~IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;wBAC3B,OAAO,KAAyB,CAAC;qBAClC;iBACF;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO,kBAAkB,CACvB,YAAY,EACZ,KAAK,EAAE,MAAoC,EAAE,IAAoB,EAAE,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAChH,EAAE,MAAM,EAAE,aAAa,EAAE,CAC1B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,MAAc;QAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9C,~~wEAAwE;QACxE,~~IAAI,GAAG,IAAI,GAAG,KAAK,IAAI,EAAE;YACvB,OAAO,GAAG,IAAI,SAAS,CAAC;SACzB;QAED,IAAI;YACF,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAC9D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3C,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE;gBACrB,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC/C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAqB,CAAC;gBACzC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACvC,IAAI,QAAQ,EAAE;oBACZ,MAAM,MAAM,GAAG,QAAQ;yBACpB,QAAQ,EAAE;yBACV,KAAK,CAAC,OAAO,CAAC;yBACd,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;yBAChC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;yBAC9C,MAAM,CAAC,OAAO,CAAC;yBACf,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC7C,KAAK,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC,IAAI,MAAM,EAAE;wBAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBACvC,MAAM,gBAAgB,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;wBAChG,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,CAAC;qBAClD;iBACF;gBAED,OAAO,GAAG,CAAC;aACZ;SACF;QAAC,MAAM,~~GAAE~~;~~QAEV~~,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,GAAG,~~IAA6C~~,EAAkC,EAAE,~~CAC3H~~,IAAI,SAAS,CAAC,GAAG,~~IAAI~~,CAAC,CAAC,eAAe,EAAE,CAAC"}
1	+ {"version":3,"file":"yo-resolve.js","sourceRoot":"","sources":["../src/yo-resolve.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@yeoman/conflicter",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "private": false,
   "description": "Conflict resolution for yeoman's generator/environment stack",
   "keywords": [
@@ -29,33 +29,36 @@
     "clean": "rimraf dist",
     "clean-all": "npm run clean && rimraf node_modules",
     "precommit": "lint-staged",
-    "pretest": "xo",
     "test": "vitest run --coverage"
   },
   "dependencies": {
-    "@types/node": "^16.18.28",
     "@yeoman/transform": "^1.2.0",
     "binary-extensions": "^2.2.0",
     "cli-table": "^0.3.11",
     "dateformat": "^5.0.3",
-    "diff": "^5.1.0",
+    "diff": "^7.0.0",
     "isbinaryfile": "^5.0.0",
     "mem-fs-editor": "^11.0.0",
     "minimatch": "^9.0.0",
     "p-transform": "^4.1.3",
     "pretty-bytes": "^6.1.0",
-    "textextensions": "^5.16.0"
+    "slash": "^5.1.0",
+    "textextensions": "^6.11.0"
   },
   "devDependencies": {
     "@types/cli-table": "^0.3.1",
     "@types/dateformat": "^5.0.0",
     "@types/diff": "^5.0.3",
+    "@types/node": "16.18.28",
     "@types/textextensions": "^2.4.0",
     "@yeoman/adapter": "*",
-    "lodash-es": "^4.17.21",
-    "slash": "^5.1.0"
+    "lodash-es": "^4.17.21"
+  },
+  "acceptDependencies": {
+    "@yeoman/transform": "^2.0.0"
   },
   "peerDependencies": {
+    "@types/node": ">=18.12.0",
     "@yeoman/types": "^1.0.0",
     "mem-fs": "^4.0.0"
   },
@@ -66,5 +69,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "62e9647453325f4afcbd2c5bf4bfcd4f57c65f0d"
+  "gitHead": "c348c764066d1a6159ac9da52a7ab5a417904abb"
 }