@yeoman/conflicter 2.3.1 → 2.4.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 (4) hide show
  1. package/dist/conflicter.d.ts +24 -2
  2. package/dist/conflicter.js +49 -28
  3. package/dist/conflicter.js.map +1 -1
  4. package/package.json +3 -3
package/dist/conflicter.d.ts CHANGED
@@ -1,12 +1,20 @@
1
- import type { InputOutputAdapter } from '@yeoman/types';
1
+ /// <reference types="node" resolution-mode="require"/>
2
+ /// <reference types="node" resolution-mode="require"/>
3
+ import { Buffer } from 'node:buffer';
4
+ import type { InputOutputAdapter } from '@yeoman/adapter/types';
5
+ import type expand from '@inquirer/expand';
6
+ import type { Separator } from '@inquirer/expand';
2
7
  import { type Change } from 'diff';
3
8
  import { type FileTransform } from 'mem-fs';
4
9
  import type { MemFsEditorFile } from 'mem-fs-editor';
5
10
  declare const statusToSkipFile: readonly ["skip", "diff", "ignore"];
6
11
  export type ConflicterLog = ['create', 'skip', 'identical', 'force', 'conflict'][number];
7
12
  export type ConflicterStatus = ConflicterLog | (typeof statusToSkipFile)[number];
8
- export type ConflicterAction = 'write' | 'abort' | 'diff' | 'reload' | 'force' | 'edit';
13
+ export type ConflicterAction = 'write' | 'abort' | 'diff' | 'reload' | 'force' | 'edit' | 'ask' | 'skip' | 'ignore';
9
14
  export declare function setConflicterStatus<F extends ConflicterFile = ConflicterFile>(file: F, status?: ConflicterStatus): F;
15
+ type ConflicterData = {
16
+ diskContents: Buffer;
17
+ };
10
18
  export type ConflicterFile = MemFsEditorFile & {
11
19
  relativePath: string;
12
20
  conflicter?: ConflicterStatus;
@@ -14,11 +22,23 @@ export type ConflicterFile = MemFsEditorFile & {
14
22
  changesDetected?: boolean;
15
23
  binary?: boolean;
16
24
  conflicterChanges?: Change[];
25
+ conflicterData?: ConflicterData;
17
26
  };
18
27
  export type ConflictedFile = ConflicterFile & {
19
28
  conflicterChanges: Change[];
20
29
  changesDetected: true;
30
+ conflicterData: ConflicterData;
31
+ };
32
+ type ActionCallbackOptions = {
33
+ file: ConflicterFile | ConflictedFile;
34
+ relativeFilePath: string;
35
+ adapter: InputOutputAdapter;
21
36
  };
37
+ type ValueActionCallback = (opt: ActionCallbackOptions) => ConflicterAction | Promise<ConflicterAction>;
38
+ type ActionChoices = Parameters<typeof expand<ConflicterAction | ValueActionCallback>>[0]['choices'];
39
+ type CustomizeActions = (actions: ActionChoices, options: {
40
+ separator?: (separator?: string) => Separator;
41
+ }) => ActionChoices;
22
42
  export type ConflicterOptions = {
23
43
  force?: boolean;
24
44
  bail?: boolean;
@@ -27,6 +47,7 @@ export type ConflicterOptions = {
27
47
  dryRun?: boolean;
28
48
  cwd?: string;
29
49
  diffOptions?: any;
50
+ customizeActions?: CustomizeActions;
30
51
  };
31
52
  type ConflicterTransformOptions = {
32
53
  yoResolveFileName?: string;
@@ -61,6 +82,7 @@ export declare class Conflicter {
61
82
  dryRun: boolean;
62
83
  cwd: string;
63
84
  diffOptions?: any;
85
+ customizeActions: CustomizeActions;
64
86
  constructor(adapter: InputOutputAdapter, options?: ConflicterOptions);
65
87
  private log;
66
88
  /**
package/dist/conflicter.js CHANGED
@@ -54,6 +54,7 @@ export class Conflicter {
54
54
  dryRun;
55
55
  cwd;
56
56
  diffOptions;
57
+ customizeActions;
57
58
  constructor(adapter, options) {
58
59
  this.adapter = adapter;
59
60
  this.force = options?.force ?? false;
@@ -63,6 +64,7 @@ export class Conflicter {
63
64
  this.dryRun = options?.dryRun ?? false;
64
65
  this.cwd = path.resolve(options?.cwd ?? process.cwd());
65
66
  this.diffOptions = options?.diffOptions;
67
+ this.customizeActions = options?.customizeActions ?? (actions => actions);
66
68
  if (this.bail) {
67
69
  // Bail conflicts with force option, if bail set force to false.
68
70
  this.force = false;
@@ -164,25 +166,26 @@ export class Conflicter {
164
166
  if (file.binary === undefined) {
165
167
  file.binary = isBinary(file.path, file.contents ?? undefined);
166
168
  }
167
- const actual = await readFile(path.resolve(filepath));
169
+ const diskContents = await readFile(path.resolve(filepath));
168
170
  if (!Buffer.isBuffer(contents)) {
169
171
  contents = Buffer.from(contents ?? '', 'utf8');
170
172
  }
171
173
  if (file.binary) {
172
- return Boolean(file.fileModeChanges) || actual.toString('hex') !== contents.toString('hex');
174
+ return Boolean(file.fileModeChanges) || diskContents.toString('hex') !== contents.toString('hex');
173
175
  }
174
176
  let modified;
175
177
  let changes;
176
178
  if (this.ignoreWhitespace) {
177
- changes = diffWords(actual.toString(), contents.toString(), this.diffOptions);
179
+ changes = diffWords(diskContents.toString(), contents.toString(), this.diffOptions);
178
180
  modified = changes.some(change => change.value?.trim() && (change.added || change.removed));
179
181
  }
180
182
  else {
181
- changes = diffLines(actual.toString(), contents.toString(), this.diffOptions);
182
- modified = (changes.length > 1 || changes[0].added || changes[0].removed) ?? false;
183
+ changes = diffLines(diskContents.toString(), contents.toString(), this.diffOptions);
184
+ modified = (changes && changes.length > 0 && (changes.length > 1 || changes[0].added || changes[0].removed)) ?? false;
183
185
  }
184
186
  if (modified) {
185
187
  file.conflicterChanges = changes;
188
+ file.conflicterData = { diskContents };
186
189
  }
187
190
  return Boolean(file.fileModeChanges) || modified;
188
191
  }
@@ -285,12 +288,13 @@ export class Conflicter {
285
288
  // Only offer diff option for files
286
289
  const fileStat = await fsStat(file.path);
287
290
  const message = `Overwrite ${file.relativePath}?`;
291
+ const { separator } = adapter;
288
292
  const result = await adapter.prompt([
289
293
  {
290
294
  name: 'action',
291
295
  type: 'expand',
292
296
  message,
293
- choices: [
297
+ choices: this.customizeActions([
294
298
  {
295
299
  key: 'y',
296
300
  name: 'overwrite',
@@ -306,22 +310,27 @@ export class Conflicter {
306
310
  name: 'overwrite this and all others',
307
311
  value: 'force',
308
312
  },
309
- {
310
- key: 'r',
311
- name: 'reload file (experimental)',
312
- value: 'reload',
313
- },
313
+ ...(fileStat.isFile()
314
+ ? [
315
+ {
316
+ key: 'd',
317
+ name: 'show the differences between the old and the new',
318
+ value: 'diff',
319
+ },
320
+ ]
321
+ : []),
314
322
  {
315
323
  key: 'x',
316
324
  name: 'abort',
317
325
  value: 'abort',
318
326
  },
327
+ ...(separator ? [separator()] : []),
319
328
  ...(fileStat.isFile()
320
329
  ? [
321
330
  {
322
- key: 'd',
323
- name: 'show the differences between the old and the new',
324
- value: 'diff',
331
+ key: 'r',
332
+ name: 'reload file (experimental)',
333
+ value: 'reload',
325
334
  },
326
335
  {
327
336
  key: 'e',
@@ -335,17 +344,18 @@ export class Conflicter {
335
344
  },
336
345
  ]
337
346
  : []),
338
- ],
347
+ ], { separator }),
339
348
  },
340
349
  ]);
341
- if (typeof result.action === 'function') {
342
- return result.action.call(this, { file, relativeFilePath: file.relativePath, adapter });
350
+ let { action } = result;
351
+ if (typeof action === 'function') {
352
+ action = await action.call(this, { file, relativeFilePath: file.relativePath, adapter });
343
353
  }
344
- if (result.action === 'abort') {
354
+ if (action === 'abort') {
345
355
  adapter.log.writeln('Aborting ...');
346
356
  throw new Error('Process aborted by user');
347
357
  }
348
- if (result.action === 'diff') {
358
+ if (action === 'diff') {
349
359
  await this._printDiff({ file, adapter });
350
360
  counter++;
351
361
  if (counter === 5) {
@@ -353,19 +363,22 @@ export class Conflicter {
353
363
  }
354
364
  return this._ask({ file, counter, adapter });
355
365
  }
356
- if (result.action === 'force') {
366
+ if (action === 'force') {
357
367
  this.force = true;
368
+ return 'force';
358
369
  }
359
- if (result.action === 'write') {
370
+ if (action === 'write') {
360
371
  return 'force';
361
372
  }
362
- if (result.action === 'reload') {
373
+ if (action === 'reload') {
363
374
  if (await this._detectConflict(file)) {
364
- return this._ask({ file, counter, adapter });
375
+ action = 'ask';
376
+ }
377
+ else {
378
+ return 'identical';
365
379
  }
366
- return 'identical';
367
380
  }
368
- if (result.action === 'edit') {
381
+ if (action === 'edit') {
369
382
  const answers = await adapter.prompt([
370
383
  {
371
384
  name: 'content',
@@ -377,11 +390,19 @@ export class Conflicter {
377
390
  ]);
378
391
  file.contents = Buffer.from(answers.content ?? '', 'utf8');
379
392
  if (await this._detectConflict(file)) {
380
- return this._ask({ file, counter, adapter });
393
+ action = 'ask';
381
394
  }
382
- return 'skip';
395
+ else {
396
+ return 'skip';
397
+ }
398
+ }
399
+ if (action === 'ask') {
400
+ return this._ask({ file, counter, adapter });
401
+ }
402
+ if (!['skip', 'ignore'].includes(action)) {
403
+ this.adapter.log.info(`Unknown conflicater action: ${result.action}`);
383
404
  }
384
- return result.action;
405
+ return action;
385
406
  }
386
407
  createTransform({ yoResolveFileName } = {}) {
387
408
  const yoResolveFilePath = path.resolve(this.cwd, yoResolveFileName ?? '.yo-resolve');
package/dist/conflicter.js.map CHANGED
@@ -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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@yeoman/conflicter",
3
- "version": "2.3.1",
3
+ "version": "2.4.0",
4
4
  "private": false,
5
5
  "description": "Conflict resolution for yeoman's generator/environment stack",
6
6
  "keywords": [
@@ -48,7 +48,7 @@
48
48
  "devDependencies": {
49
49
  "@types/cli-table": "^0.3.4",
50
50
  "@types/dateformat": "^5.0.2",
51
- "@types/diff": "^5.2.3",
51
+ "@types/diff": "^7.0.0",
52
52
  "@types/node": "^18.19.0",
53
53
  "@types/textextensions": "^2.4.2",
54
54
  "@yeoman/adapter": "*",
@@ -71,5 +71,5 @@
71
71
  "access": "public",
72
72
  "registry": "https://registry.npmjs.org/"
73
73
  },
74
- "gitHead": "55a9a15364c787f0a14b77e6f3d294f3fa2822e0"
74
+ "gitHead": "198ac55ddf8311228c6e47a112a1cd4cb6eb12f3"
75
75
  }