fix(conflicter): filter files at transforms

yeoman · Oct 12, 2023 · be768f7 · be768f7
1 parent b5aabfd
commit be768f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/workspaces/conflicter/src/transform.ts b/workspaces/conflicter/src/transform.ts
@@ -1,9 +1,11 @@
 import { transformFileField } from '@yeoman/transform';
 import { type FileTransform } from 'mem-fs';
 import { type MemFsEditorFile } from 'mem-fs-editor';
+// eslint-disable-next-line n/file-extension-in-import
+import { isFilePending } from 'mem-fs-editor/state';
 import { type ConflicterFile } from './conflicter.js';
 
 export const forceFileTransform = (pattern: string): FileTransform<MemFsEditorFile> =>
-  transformFileField<'conflicter', ConflicterFile>('conflicter', 'force', { pattern });
+  transformFileField<'conflicter', ConflicterFile>('conflicter', 'force', { pattern, filter: isFilePending });
 
 export const forceYoFiles = (): FileTransform<MemFsEditorFile> => forceFileTransform('**/{.yo-rc.json,.yo-resolve,.yo-rc-global.json}');
diff --git a/workspaces/conflicter/src/yo-resolve.ts b/workspaces/conflicter/src/yo-resolve.ts
@@ -5,6 +5,8 @@ import slash from 'slash';
 import { transformFileField } from '@yeoman/transform';
 import { type FileTransform } from 'mem-fs';
 import { type MemFsEditorFile } from 'mem-fs-editor';
+// eslint-disable-next-line n/file-extension-in-import
+import { isFilePending } from 'mem-fs-editor/state';
 import { type ConflicterStatus, type ConflicterFile } from './conflicter.js';
 
 const eachFolder = function* (folder: string) {
@@ -45,6 +47,7 @@ export class YoResolve {
     return transformFileField<'conflicter', ConflicterFile>(
       'conflicter',
       async (status: ConflicterStatus | undefined, file: ConflicterFile) => status ?? this.getStatusForFile(file.path),
+      { filter: isFilePending },
     );
   }