@yeoman/conflicter 0.1.0 → 0.2.0

package/README.md

@@ -1,11 +1,11 @@
-# @yeoman/namespace
+# @yeoman/conflicter
 
 [![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
+> File conflict resolution for yeoman's generator/environment stack
 
 Intended for internal yeoman generator/environment stack use.
 

package/dist/conflicter.d.ts

@@ -5,9 +5,9 @@ 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 declare function setConflicterStatus<F extends ConflicterFile = ConflicterFile>(file: F, status: ConflicterStatus, { log }?: {
+    log?: ConflicterLog;
+}): F;
 export type ConflicterFile = MemFsEditorFile & {
     conflicterLog?: ConflicterLog;
     conflicter?: ConflicterStatus;
@@ -92,21 +92,20 @@ export declare class Conflicter {
      *   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
+     * @param file - Vinyl file
+     * @return Promise the Vinyl file
      */
-    checkForCollision(file: ConflicterFile, conflicterStatus?: ConflicterStreamStatus): Promise<ConflicterFile>;
+    checkForCollision(file: ConflicterFile): Promise<ConflicterFile>;
     /**
      * Actual prompting logic
      * @private
      * @param {import('vinyl')} file vinyl file object
      * @param {Number} counter prompts
      */
-    _ask({ file, counter, conflicterStatus, adapter, }: {
+    _ask({ file, counter, adapter, }: {
         file: ConflictedFile;
         counter: number;
-        conflicterStatus: ConflicterStreamStatus;
         adapter: InputOutputAdapter;
     }): Promise<ConflicterStatus>;
+    createTransform(): import("p-transform").default;
 }

package/dist/conflicter.js

@@ -5,7 +5,17 @@ import process from 'node:process';
 import { Buffer } from 'node:buffer';
 import { diffWords, diffLines } from 'diff';
 import { create as createMemFsEditor } from 'mem-fs-editor';
+// eslint-disable-next-line n/file-extension-in-import
+import { clearFileState } from 'mem-fs-editor/state';
+import { passthrough } from 'p-transform';
 import { binaryDiff, isBinary } from './binary-diff.js';
+export function setConflicterStatus(file, status, { log } = {}) {
+    file.conflicter = status;
+    if (log) {
+        file.conflicterLog = log;
+    }
+    return file;
+}
 /**
  * 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
@@ -39,7 +49,9 @@ export class Conflicter {
     fs;
     constructor(adapter, options) {
         this.adapter = adapter;
-        this.fs = createMemFsEditor(options?.memFs);
+        if (options?.memFs) {
+            this.fs = createMemFsEditor(options?.memFs);
+        }
         this.force = options?.force ?? false;
         this.bail = options?.bail ?? false;
         this.ignoreWhitespace = options?.ignoreWhitespace ?? false;
@@ -85,7 +97,7 @@ export class Conflicter {
                     if (message) {
                         returnValue.push({ message, color: colored.color });
                     }
-                    if (lines.length > idx) {
+                    if (idx + 1 < lines.length) {
                         returnValue.push({ message: '\n' });
                     }
                 }
@@ -171,12 +183,10 @@ export class Conflicter {
      *   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
+     * @param file - Vinyl file
+     * @return Promise the Vinyl file
      */
-    // eslint-disable-next-line unicorn/no-object-as-default-parameter
-    async checkForCollision(file, conflicterStatus = { force: false }) {
+    async checkForCollision(file) {
         const rfilepath = path.relative(this.cwd, file.path);
         if (file.conflicter) {
             this._log(file.conflicter, rfilepath);
@@ -188,14 +198,13 @@ export class Conflicter {
                 throw new Error(`Process aborted by conflict: ${rfilepath}`);
             }
             this._log('create', rfilepath);
-            file.conflicter = this.dryRun ? 'skip' : 'create';
-            file.conflicterLog = 'create';
+            setConflicterStatus(file, this.dryRun ? 'skip' : 'create', { log: 'create' });
             return file;
         }
-        const isForce = () => this.force || conflicterStatus?.force;
+        const isForce = () => this.force;
         if (isForce()) {
             this._log('force', rfilepath);
-            file.conflicter = 'force';
+            setConflicterStatus(file, 'force');
             return file;
         }
         if (await this._detectConflict(file)) {
@@ -211,20 +220,19 @@ export class Conflicter {
             if (this.dryRun) {
                 this._log('conflict', rfilepath);
                 await this._printDiff({ file: conflictedFile });
-                file.conflicter = 'skip';
-                file.conflicterLog = 'conflict';
+                setConflicterStatus(file, 'skip', { log: 'conflict' });
                 return file;
             }
             if (isForce()) {
-                file.conflicter = 'force';
+                setConflicterStatus(file, '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 });
+                const action = await this._ask({ file: conflictedFile, counter: 1, adapter });
                 adapter.log[action ?? 'force'](rfilepath);
-                file.conflicter = action;
+                setConflicterStatus(file, action);
                 return file;
             };
             if (this.adapter.queue) {
@@ -238,11 +246,10 @@ export class Conflicter {
         }
         this._log('identical', rfilepath);
         if (!this.regenerate) {
-            file.conflicter = 'skip';
-            file.conflicterLog = 'identical';
+            setConflicterStatus(file, 'skip', { log: 'identical' });
             return file;
         }
-        file.conflicter = 'identical';
+        setConflicterStatus(file, 'identical');
         return file;
     }
     /**
@@ -251,7 +258,7 @@ export class Conflicter {
      * @param {import('vinyl')} file vinyl file object
      * @param {Number} counter prompts
      */
-    async _ask({ file, counter, conflicterStatus, adapter, }) {
+    async _ask({ file, counter, adapter, }) {
         if (file.conflicter) {
             return file.conflicter;
         }
@@ -301,14 +308,15 @@ export class Conflicter {
                 name: 'edit file (experimental)',
                 value: 'edit',
             });
-            if (this.fs) {
+            const { fs } = this;
+            if (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 });
+                        fs.append(`${this.cwd}/.yo-resolve`, `${relativeFilePath} skip`, { create: true });
                         return 'skip';
                     },
                 });
@@ -330,22 +338,17 @@ export class Conflicter {
             if (counter === 5) {
                 throw new Error(`Recursive error ${prompt.message}`);
             }
-            return this._ask({ file, counter, conflicterStatus, adapter });
+            return this._ask({ file, counter, adapter });
         }
         if (result.action === 'force') {
-            if (conflicterStatus) {
-                conflicterStatus.force = true;
-            }
-            else {
-                this.force = true;
-            }
+            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 this._ask({ file, counter, adapter });
             }
             return 'identical';
         }
@@ -361,11 +364,26 @@ export class Conflicter {
             ]);
             file.contents = Buffer.from(answers.content ?? '', 'utf8');
             if (await this._detectConflict(file)) {
-                return this._ask({ file, counter, conflicterStatus, adapter });
+                return this._ask({ file, counter, adapter });
             }
             return 'skip';
         }
         return result.action;
     }
+    createTransform() {
+        return passthrough(async (file) => {
+            const conflicterFile = await this.checkForCollision(file);
+            const action = conflicterFile.conflicter;
+            delete conflicterFile.conflicter;
+            delete conflicterFile.conflicterLog;
+            delete conflicterFile.binary;
+            delete conflicterFile.conflicterChanges;
+            if (action === 'skip') {
+                clearFileState(conflicterFile);
+                return undefined;
+            }
+            return conflicterFile;
+        }, 'conflicter:check');
+    }
 }
 //# sourceMappingURL=conflicter.js.map

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/dist/index.d.ts

@@ -0,0 +1 @@
+export * from './conflicter.js';

package/dist/index.js

@@ -0,0 +1,2 @@
+export * from './conflicter.js';
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeoman/conflicter",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": false,
   "description": "Conflict resolution for yeoman's generator/environment stack",
   "keywords": [
@@ -33,6 +33,7 @@
     "test": "c8 esmocha --forbid-only"
   },
   "dependencies": {
+    "@types/node": "^16.18.28",
     "@yeoman/types": "^0.2.0",
     "binary-extensions": "^2.2.0",
     "cli-table": "^0.3.11",
@@ -41,6 +42,7 @@
     "isbinaryfile": "^5.0.0",
     "mem-fs": "^3.0.0",
     "mem-fs-editor": "^10.0.2",
+    "p-transform": "^2.0.1",
     "pretty-bytes": "^6.1.0",
     "textextensions": "^5.16.0"
   },
@@ -49,7 +51,7 @@
     "@types/dateformat": "^5.0.0",
     "@types/diff": "^5.0.3",
     "@types/textextensions": "^2.4.0",
-    "@yeoman/adapter": "^0.1.0",
+    "@yeoman/adapter": "^0.1.1",
     "esmocha": "^0.1.4",
     "lodash-es": "^4.17.21",
     "sinon": "^15.0.4",
@@ -63,5 +65,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "1982816cfe6af4e92f999e344cf9b8539ff308eb"
+  "gitHead": "f236657d5e67daa25ba157e616c2791f41560104"
 }