@draftline/client 0.1.1 → 0.1.3

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.
package/README.md CHANGED
@@ -4,6 +4,42 @@
4
4
  It wraps Tauri `invoke` calls and mirrors the serializable shapes from
5
5
  `draftline::tauri_contract`.
6
6
 
7
+ The client also exposes the stable Draftline workspace event channel used by
8
+ configured Tauri hosts:
9
+
10
+ ```ts
11
+ const client = createDraftlineClient();
12
+ const unlisten = await client.subscribeWorkspaceEvents((event) => {
13
+ if (event.kind === 'history_changed' || event.kind === 'dirty_changed') {
14
+ // Refresh product UI from inspectWorkspace.
15
+ }
16
+ });
17
+ ```
18
+
19
+ Remote merge flows use the same typed DTOs as `draftline::tauri_contract`.
20
+ Call `preflightMergeIncoming` first; if it returns conflicts and a token with
21
+ `can_merge_cleanly: false`, use `createMergeConflictViewModel` to render
22
+ file/field groups and `createWholeFileUseContentResolutions` when the product UI
23
+ offers whole-file "use ours/theirs/base" actions. Those helpers emit explicit
24
+ `use_content` resolutions so the submitted payload matches the content the user
25
+ reviewed:
26
+
27
+ ```ts
28
+ await client.mergeIncomingWithResolutions({
29
+ workspace_path: workspacePath,
30
+ remote: 'origin',
31
+ label: 'Resolve teammate changes',
32
+ token: preflight.token,
33
+ resolutions: createWholeFileUseContentResolutions(preflight, 'theirs'),
34
+ });
35
+ ```
36
+
37
+ For host code, `createDraftlineHostFacade` binds a client to one workspace path
38
+ and exposes product-level operations such as `save`, `selectedSave`,
39
+ `diffWorkspaceFile`, `previewWorkspaceFile`, `fetchRemote`, `mergeIncoming`,
40
+ `mergeIncomingWithResolutions`, recovery repair/rollback, and remote variation
41
+ adoption without repeating request DTO plumbing in every component.
42
+
7
43
  Build from the repository root:
8
44
 
9
45
  ```powershell
package/dist/index.d.ts CHANGED
@@ -1,15 +1,49 @@
1
1
  export type DraftlineInvoke = <T>(command: string, args?: Record<string, unknown>) => Promise<T>;
2
+ export type DraftlineUnlisten = () => void;
3
+ export type DraftlineListen = <T>(event: string, handler: (event: {
4
+ payload: T;
5
+ }) => void) => Promise<DraftlineUnlisten>;
6
+ export type DraftlineEventHandler = (event: DraftlineEvent) => void;
2
7
  export interface DraftlineClientOptions {
3
8
  invoke?: DraftlineInvoke;
9
+ listen?: DraftlineListen;
10
+ workspaceEventName?: string;
4
11
  onCommandStart?: (command: string, args?: Record<string, unknown>) => void;
5
12
  onCommandSuccess?: (command: string, result: unknown) => void;
6
13
  onCommandError?: (command: string, error: unknown) => void;
7
14
  }
8
15
  export interface DraftlineClient {
16
+ openWorkspace(workspacePath: string): Promise<WorkspaceOpenResult>;
17
+ cloneWorkspace(request: CloneWorkspaceRequest): Promise<WorkspaceOpenResult>;
18
+ adoptWorkspace(workspacePath: string): Promise<AdoptWorkspaceResult>;
9
19
  inspectWorkspace(workspacePath: string): Promise<WorkspaceDiagnostics>;
10
20
  verifyWorkspace(workspacePath: string): Promise<WorkspaceVerification>;
11
21
  listVariations(workspacePath: string): Promise<VariationSummary[]>;
12
22
  listSupportRefs(workspacePath: string, scope: SupportRefScope): Promise<SupportRef[]>;
23
+ listRemotes(workspacePath: string): Promise<RemoteEndpoint[]>;
24
+ listRemoteVariations(request: RemoteRequest): Promise<RemoteVariation[]>;
25
+ remoteVariationDiagnostics(request: RemoteRequest): Promise<RemoteVariationDiagnostics>;
26
+ adoptRemoteVariation(request: RemoteVariationRequest): Promise<AdoptRemoteVariationResult>;
27
+ getChanges(workspacePath: string): Promise<ChangeSet>;
28
+ getHistory(workspacePath: string): Promise<HistoryEntry[]>;
29
+ getFullHistory(workspacePath: string): Promise<HistoryEntry[]>;
30
+ diffVersions(request: DiffVersionsRequest): Promise<VersionDiff>;
31
+ diffVersionToWorkspace(request: VersionRequest): Promise<VersionDiff>;
32
+ diffWorkspaceFile(request: CurrentFileRequest): Promise<CurrentFileDiff | null>;
33
+ previewVersion(request: VersionRequest): Promise<VersionPreview>;
34
+ previewVersionFile(request: PreviewVersionFileRequest): Promise<PreviewFile | null>;
35
+ previewWorkspaceFile(request: CurrentFileRequest): Promise<CurrentFilePreview | null>;
36
+ restoreVersionAsNewSave(request: RestoreVersionRequest): Promise<RestoreVersionResult>;
37
+ save(request: SaveRequest): Promise<SaveResult>;
38
+ listShelves(workspacePath: string): Promise<Shelf[]>;
39
+ previewShelf(request: ShelfRequest): Promise<VersionPreview>;
40
+ preflightApplyShelf(request: ShelfRequest): Promise<ShelfApplyReport>;
41
+ applyShelf(request: ShelfRequest): Promise<ApplyShelfCommandResult>;
42
+ deleteShelf(request: ShelfRequest): Promise<DeleteShelfResult>;
43
+ auditContentPolicy(workspacePath: string): Promise<ContentPolicyAudit>;
44
+ clearStaleLock(workspacePath: string): Promise<CommandPostconditions>;
45
+ repairRecovery(request: RecoveryRequest): Promise<RecoveryRepairResult>;
46
+ rollbackRecovery(request: RecoveryRequest): Promise<RecoveryRepairResult>;
13
47
  selectedSave(request: SelectedSaveRequest): Promise<SelectedSaveResult>;
14
48
  selectedShelve(request: SelectedShelveRequest): Promise<SelectedShelveResult>;
15
49
  selectedDiscard(request: SelectedDiscardRequest): Promise<SelectedDiscardResult>;
@@ -19,6 +53,8 @@ export interface DraftlineClient {
19
53
  applyIncoming(request: RemoteRequest): Promise<ApplyIncomingCommandResult>;
20
54
  preflightMergeIncoming(request: RemoteRequest): Promise<MergeIncomingReport>;
21
55
  mergeIncoming(request: MergeIncomingRequest): Promise<MergeIncomingCommandResult>;
56
+ mergeIncomingWithResolutions(request: MergeIncomingWithResolutionsRequest): Promise<MergeIncomingCommandResult>;
57
+ subscribeWorkspaceEvents(handler: DraftlineEventHandler): Promise<DraftlineUnlisten>;
22
58
  }
23
59
  export declare function setDraftlineInvoke(invoke: DraftlineInvoke): void;
24
60
  export declare function createDraftlineClient(options?: DraftlineClientOptions): DraftlineClient;
@@ -28,6 +64,7 @@ export type JsonValue = null | boolean | number | string | JsonValue[] | {
28
64
  export type ChangeKind = 'Added' | 'Modified' | 'Deleted' | 'Renamed' | 'Conflicted' | 'TypeChanged';
29
65
  export type DiagnosticSeverity = 'info' | 'warning' | 'blocking';
30
66
  export type OperationLockState = 'unlocked' | 'locked';
67
+ export type DraftlineEventKind = 'workspace_changed' | 'dirty_changed' | 'history_changed' | 'sync_changed' | 'recovery_required' | 'operation_lock_changed' | 'policy_changed';
31
68
  export type SafeNextAction = 'normal_work' | 'save_first' | 'discard_changes' | 'repair_recovery' | 'configure_remote';
32
69
  export type SharingMode = 'local_only' | 'shared_capable';
33
70
  export type SupportRefScope = 'local' | 'remote_tracking';
@@ -59,6 +96,12 @@ export interface VariationSummary {
59
96
  head_version?: Version | null;
60
97
  reachable_version_count: number;
61
98
  }
99
+ export interface HistoryEntry {
100
+ version: Version;
101
+ variation_tips: string[];
102
+ is_head: boolean;
103
+ parent_ids: string[];
104
+ }
62
105
  export interface ChangedFile {
63
106
  path: string;
64
107
  kind: ChangeKind;
@@ -69,6 +112,32 @@ export interface ChangeSet {
69
112
  files: ChangedFile[];
70
113
  diff?: string | null;
71
114
  }
115
+ export interface VersionDiff {
116
+ from_version?: string | null;
117
+ to_version?: string | null;
118
+ files: ChangedFile[];
119
+ patch?: string | null;
120
+ }
121
+ export interface CurrentFileDiff {
122
+ path: string;
123
+ file?: ChangedFile | null;
124
+ patch?: string | null;
125
+ preview?: CurrentFilePreview | null;
126
+ }
127
+ export interface PreviewFile {
128
+ path: string;
129
+ content?: string | null;
130
+ is_binary: boolean;
131
+ }
132
+ export interface CurrentFilePreview {
133
+ path: string;
134
+ content?: string | null;
135
+ is_binary: boolean;
136
+ }
137
+ export interface VersionPreview {
138
+ id: string;
139
+ files: PreviewFile[];
140
+ }
72
141
  export interface FileHazard {
73
142
  path: string;
74
143
  kind: string;
@@ -105,6 +174,18 @@ export interface RemoteEndpoint {
105
174
  name: string;
106
175
  url: string;
107
176
  }
177
+ export interface RemoteVariation {
178
+ id: string;
179
+ name: string;
180
+ remote: string;
181
+ head_version?: Version | null;
182
+ }
183
+ export interface RemoteVariationDiagnostics {
184
+ remote: string;
185
+ shared_variations: string[];
186
+ local_only_variations: string[];
187
+ remote_only_variations: string[];
188
+ }
108
189
  export interface DirtySummary {
109
190
  is_dirty: boolean;
110
191
  files: ChangedFile[];
@@ -161,6 +242,38 @@ export interface WorkspaceDiagnostics {
161
242
  verification: WorkspaceVerification;
162
243
  operation_lock: OperationLockInspection;
163
244
  }
245
+ export interface WorkspaceOpenResult {
246
+ diagnostics: WorkspaceDiagnostics;
247
+ }
248
+ export interface AdoptWorkspaceResult {
249
+ preflight: AdoptionPreflightReport;
250
+ diagnostics: WorkspaceDiagnostics;
251
+ }
252
+ export interface AdoptionPreflightReport {
253
+ inspection: WorkspaceInspection;
254
+ candidate_policy_diagnostics: WorkspaceDiagnostic[];
255
+ blockers: WorkspaceDiagnostic[];
256
+ warnings: WorkspaceDiagnostic[];
257
+ safe_next_actions: SafeNextAction[];
258
+ can_adopt: boolean;
259
+ }
260
+ export interface ContentPolicyAudit {
261
+ current_diagnostics: WorkspaceDiagnostic[];
262
+ historical_out_of_policy_paths: string[];
263
+ }
264
+ export interface DraftlineEvent {
265
+ workspace_id: {
266
+ root: string;
267
+ };
268
+ kind: DraftlineEventKind;
269
+ sequence: number;
270
+ changed_paths: string[];
271
+ active_variation?: string | null;
272
+ dirty?: DirtySummary | null;
273
+ sync?: SyncStatus | null;
274
+ recovery?: RecoveryState | null;
275
+ diagnostics: WorkspaceDiagnostic[];
276
+ }
164
277
  export interface TauriCommandError {
165
278
  code: string;
166
279
  message: string;
@@ -175,6 +288,35 @@ export interface Shelf {
175
288
  id: string;
176
289
  version: Version;
177
290
  }
291
+ export interface ShelfApplyReport {
292
+ shelf: Shelf;
293
+ dirty_files: ChangedFile[];
294
+ file_hazards: FileHazard[];
295
+ can_proceed: boolean;
296
+ }
297
+ export interface RestoreVersionResult {
298
+ version: Version;
299
+ postconditions: CommandPostconditions;
300
+ }
301
+ export interface SaveResult {
302
+ version: Version;
303
+ postconditions: CommandPostconditions;
304
+ }
305
+ export interface ApplyShelfCommandResult {
306
+ preflight: ShelfApplyReport;
307
+ shelf: Shelf;
308
+ postconditions: CommandPostconditions;
309
+ }
310
+ export interface DeleteShelfResult {
311
+ postconditions: CommandPostconditions;
312
+ }
313
+ export interface RecoveryRepairResult {
314
+ operation_id: string;
315
+ operation: string;
316
+ completed: boolean;
317
+ changed_workspace: boolean;
318
+ safe_next_actions: SafeNextAction[];
319
+ }
178
320
  export interface SelectedSaveResult {
179
321
  preflight: PreflightReport;
180
322
  version: Version;
@@ -223,6 +365,10 @@ export interface PublishCurrentVariationResult {
223
365
  publish: PublishResult;
224
366
  postconditions: CommandPostconditions;
225
367
  }
368
+ export interface AdoptRemoteVariationResult {
369
+ variation: Variation;
370
+ postconditions: CommandPostconditions;
371
+ }
226
372
  export interface ApplyIncomingReport {
227
373
  sync_status: SyncStatus;
228
374
  dirty_files: ChangedFile[];
@@ -240,14 +386,43 @@ export interface ApplyIncomingCommandResult {
240
386
  }
241
387
  export interface MergeConflict {
242
388
  path: string;
389
+ field_path?: string | null;
243
390
  label: string;
391
+ base?: string | null;
392
+ ours?: string | null;
393
+ theirs?: string | null;
394
+ resolution: 'Choose' | 'Edit' | 'Combine' | 'Delete';
395
+ }
396
+ export type MergeResolutionChoice = {
397
+ kind: 'use_ours';
398
+ } | {
399
+ kind: 'use_theirs';
400
+ } | {
401
+ kind: 'use_base';
402
+ } | {
403
+ kind: 'delete';
404
+ } | {
405
+ kind: 'use_content';
406
+ content: string;
407
+ };
408
+ export interface MergeConflictResolution {
409
+ path: string;
410
+ field_path?: string | null;
411
+ choice: MergeResolutionChoice;
412
+ }
413
+ export interface MergeIncomingToken {
414
+ remote: string;
415
+ variation: string;
416
+ local_oid: string;
417
+ remote_oid: string;
418
+ merge_base_oid: string;
244
419
  }
245
420
  export interface MergeIncomingReport {
246
421
  sync_status: SyncStatus;
247
422
  dirty_files: ChangedFile[];
248
423
  file_hazards: FileHazard[];
249
424
  conflicts: MergeConflict[];
250
- token?: JsonValue | null;
425
+ token?: MergeIncomingToken | null;
251
426
  can_merge_cleanly: boolean;
252
427
  changed_workspace: boolean;
253
428
  }
@@ -260,6 +435,25 @@ export interface MergeIncomingCommandResult {
260
435
  merge: MergeIncomingResult;
261
436
  postconditions: CommandPostconditions;
262
437
  }
438
+ export type ConflictContentSource = 'ours' | 'theirs' | 'base';
439
+ export interface MergeConflictViewModel {
440
+ files: MergeFileConflictGroup[];
441
+ token?: MergeIncomingToken | null;
442
+ can_merge_cleanly: boolean;
443
+ }
444
+ export interface MergeFileConflictGroup {
445
+ path: string;
446
+ label: string;
447
+ whole_file_conflicts: MergeConflictItem[];
448
+ field_conflicts: MergeFieldConflictGroup[];
449
+ }
450
+ export interface MergeFieldConflictGroup {
451
+ field_path: string;
452
+ label: string;
453
+ conflicts: MergeConflictItem[];
454
+ }
455
+ export interface MergeConflictItem extends MergeConflict {
456
+ }
263
457
  export interface SupportRef {
264
458
  id: string;
265
459
  ref_name: string;
@@ -271,9 +465,37 @@ export interface SupportRef {
271
465
  export interface WorkspaceRequest {
272
466
  workspace_path: string;
273
467
  }
468
+ export interface CloneWorkspaceRequest extends WorkspaceRequest {
469
+ remote_url: string;
470
+ }
274
471
  export interface ListSupportRefsRequest extends WorkspaceRequest {
275
472
  scope: SupportRefScope;
276
473
  }
474
+ export interface VersionRequest extends WorkspaceRequest {
475
+ version_id: string;
476
+ }
477
+ export interface CurrentFileRequest extends WorkspaceRequest {
478
+ path: string;
479
+ }
480
+ export interface PreviewVersionFileRequest extends VersionRequest {
481
+ path: string;
482
+ }
483
+ export interface DiffVersionsRequest extends WorkspaceRequest {
484
+ from_version_id: string;
485
+ to_version_id: string;
486
+ }
487
+ export interface RestoreVersionRequest extends VersionRequest {
488
+ label: string;
489
+ }
490
+ export interface SaveRequest extends WorkspaceRequest {
491
+ label: string;
492
+ }
493
+ export interface ShelfRequest extends WorkspaceRequest {
494
+ shelf_id: string;
495
+ }
496
+ export interface RecoveryRequest extends WorkspaceRequest {
497
+ operation_id: string;
498
+ }
277
499
  export interface SelectedSaveRequest extends WorkspaceRequest {
278
500
  paths: string[];
279
501
  label: string;
@@ -291,6 +513,9 @@ export interface PublishCurrentVariationRequest extends WorkspaceRequest {
291
513
  export interface RemoteRequest extends WorkspaceRequest {
292
514
  remote: string;
293
515
  }
516
+ export interface RemoteVariationRequest extends RemoteRequest {
517
+ variation_id: string;
518
+ }
294
519
  export interface FetchRemoteResult {
295
520
  sync_status: SyncStatus;
296
521
  postconditions: CommandPostconditions;
@@ -298,10 +523,86 @@ export interface FetchRemoteResult {
298
523
  export interface MergeIncomingRequest extends RemoteRequest {
299
524
  label: string;
300
525
  }
526
+ export interface MergeIncomingWithResolutionsRequest extends MergeIncomingRequest {
527
+ token: MergeIncomingToken;
528
+ resolutions: MergeConflictResolution[];
529
+ }
530
+ export interface DraftlineHostFacadeOptions {
531
+ client?: DraftlineClient;
532
+ defaultRemote?: string;
533
+ workspacePath: string;
534
+ }
535
+ export interface DraftlineHostFacade {
536
+ workspacePath: string;
537
+ open(): Promise<WorkspaceOpenResult>;
538
+ inspect(): Promise<WorkspaceDiagnostics>;
539
+ save(label: string): Promise<SaveResult>;
540
+ selectedSave(paths: string[], label: string): Promise<SelectedSaveResult>;
541
+ selectedShelve(paths: string[], name: string): Promise<SelectedShelveResult>;
542
+ selectedDiscard(paths: string[]): Promise<SelectedDiscardResult>;
543
+ history(): Promise<HistoryEntry[]>;
544
+ fullHistory(): Promise<HistoryEntry[]>;
545
+ changes(): Promise<ChangeSet>;
546
+ variations(): Promise<VariationSummary[]>;
547
+ remotes(): Promise<RemoteEndpoint[]>;
548
+ supportRefs(scope: SupportRefScope): Promise<SupportRef[]>;
549
+ diffVersions(fromVersionId: string, toVersionId: string): Promise<VersionDiff>;
550
+ diffVersionToWorkspace(versionId: string): Promise<VersionDiff>;
551
+ diffWorkspaceFile(path: string): Promise<CurrentFileDiff | null>;
552
+ previewVersion(versionId: string): Promise<VersionPreview>;
553
+ previewVersionFile(versionId: string, path: string): Promise<PreviewFile | null>;
554
+ previewWorkspaceFile(path: string): Promise<CurrentFilePreview | null>;
555
+ restoreAsNewSave(versionId: string, label: string): Promise<RestoreVersionResult>;
556
+ shelves(): Promise<Shelf[]>;
557
+ previewShelf(shelfId: string): Promise<VersionPreview>;
558
+ applyShelf(shelfId: string): Promise<ApplyShelfCommandResult>;
559
+ repairRecovery(operationId: string): Promise<RecoveryRepairResult>;
560
+ rollbackRecovery(operationId: string): Promise<RecoveryRepairResult>;
561
+ fetchRemote(remote?: string): Promise<FetchRemoteResult>;
562
+ publishCurrentVariation(remote?: string): Promise<PublishCurrentVariationResult>;
563
+ preflightApplyIncoming(remote?: string): Promise<ApplyIncomingReport>;
564
+ applyIncoming(remote?: string): Promise<ApplyIncomingCommandResult>;
565
+ preflightMergeIncoming(remote?: string): Promise<MergeIncomingReport>;
566
+ mergeIncoming(label: string, remote?: string): Promise<MergeIncomingCommandResult>;
567
+ mergeIncomingWithResolutions(label: string, token: MergeIncomingToken, resolutions: MergeConflictResolution[], remote?: string): Promise<MergeIncomingCommandResult>;
568
+ remoteVariations(remote?: string): Promise<RemoteVariation[]>;
569
+ remoteVariationDiagnostics(remote?: string): Promise<RemoteVariationDiagnostics>;
570
+ adoptRemoteVariation(variationId: string, remote?: string): Promise<AdoptRemoteVariationResult>;
571
+ }
572
+ export declare function createDraftlineHostFacade({ client, defaultRemote, workspacePath, }: DraftlineHostFacadeOptions): DraftlineHostFacade;
573
+ export declare function createMergeConflictViewModel(report: MergeIncomingReport): MergeConflictViewModel;
574
+ export declare function createWholeFileUseContentResolutions(report: MergeIncomingReport, source: ConflictContentSource): MergeConflictResolution[];
575
+ export declare function openWorkspace(workspacePath: string): Promise<WorkspaceOpenResult>;
576
+ export declare function cloneWorkspace(request: CloneWorkspaceRequest): Promise<WorkspaceOpenResult>;
577
+ export declare function adoptWorkspace(workspacePath: string): Promise<AdoptWorkspaceResult>;
301
578
  export declare function inspectWorkspace(workspacePath: string): Promise<WorkspaceDiagnostics>;
302
579
  export declare function verifyWorkspace(workspacePath: string): Promise<WorkspaceVerification>;
303
580
  export declare function listVariations(workspacePath: string): Promise<VariationSummary[]>;
304
581
  export declare function listSupportRefs(workspacePath: string, scope: SupportRefScope): Promise<SupportRef[]>;
582
+ export declare function listRemotes(workspacePath: string): Promise<RemoteEndpoint[]>;
583
+ export declare function listRemoteVariations(request: RemoteRequest): Promise<RemoteVariation[]>;
584
+ export declare function remoteVariationDiagnostics(request: RemoteRequest): Promise<RemoteVariationDiagnostics>;
585
+ export declare function adoptRemoteVariation(request: RemoteVariationRequest): Promise<AdoptRemoteVariationResult>;
586
+ export declare function getChanges(workspacePath: string): Promise<ChangeSet>;
587
+ export declare function getHistory(workspacePath: string): Promise<HistoryEntry[]>;
588
+ export declare function getFullHistory(workspacePath: string): Promise<HistoryEntry[]>;
589
+ export declare function diffVersions(request: DiffVersionsRequest): Promise<VersionDiff>;
590
+ export declare function diffVersionToWorkspace(request: VersionRequest): Promise<VersionDiff>;
591
+ export declare function diffWorkspaceFile(request: CurrentFileRequest): Promise<CurrentFileDiff | null>;
592
+ export declare function previewVersion(request: VersionRequest): Promise<VersionPreview>;
593
+ export declare function previewVersionFile(request: PreviewVersionFileRequest): Promise<PreviewFile | null>;
594
+ export declare function previewWorkspaceFile(request: CurrentFileRequest): Promise<CurrentFilePreview | null>;
595
+ export declare function restoreVersionAsNewSave(request: RestoreVersionRequest): Promise<RestoreVersionResult>;
596
+ export declare function save(request: SaveRequest): Promise<SaveResult>;
597
+ export declare function listShelves(workspacePath: string): Promise<Shelf[]>;
598
+ export declare function previewShelf(request: ShelfRequest): Promise<VersionPreview>;
599
+ export declare function preflightApplyShelf(request: ShelfRequest): Promise<ShelfApplyReport>;
600
+ export declare function applyShelf(request: ShelfRequest): Promise<ApplyShelfCommandResult>;
601
+ export declare function deleteShelf(request: ShelfRequest): Promise<DeleteShelfResult>;
602
+ export declare function auditContentPolicy(workspacePath: string): Promise<ContentPolicyAudit>;
603
+ export declare function clearStaleLock(workspacePath: string): Promise<CommandPostconditions>;
604
+ export declare function repairRecovery(request: RecoveryRequest): Promise<RecoveryRepairResult>;
605
+ export declare function rollbackRecovery(request: RecoveryRequest): Promise<RecoveryRepairResult>;
305
606
  export declare function selectedSave(request: SelectedSaveRequest): Promise<SelectedSaveResult>;
306
607
  export declare function selectedShelve(request: SelectedShelveRequest): Promise<SelectedShelveResult>;
307
608
  export declare function selectedDiscard(request: SelectedDiscardRequest): Promise<SelectedDiscardResult>;
@@ -311,4 +612,5 @@ export declare function preflightApplyIncoming(request: RemoteRequest): Promise<
311
612
  export declare function applyIncoming(request: RemoteRequest): Promise<ApplyIncomingCommandResult>;
312
613
  export declare function preflightMergeIncoming(request: RemoteRequest): Promise<MergeIncomingReport>;
313
614
  export declare function mergeIncoming(request: MergeIncomingRequest): Promise<MergeIncomingCommandResult>;
615
+ export declare function mergeIncomingWithResolutions(request: MergeIncomingWithResolutionsRequest): Promise<MergeIncomingCommandResult>;
314
616
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -1,10 +1,13 @@
1
1
  import { invoke as tauriInvoke } from '@tauri-apps/api/core';
2
+ import { listen as tauriListen } from '@tauri-apps/api/event';
2
3
  let invokeDraftline = (command, args) => tauriInvoke(command, args);
3
4
  export function setDraftlineInvoke(invoke) {
4
5
  invokeDraftline = invoke;
5
6
  }
6
7
  export function createDraftlineClient(options = {}) {
7
8
  const invoke = options.invoke ?? invokeDraftline;
9
+ const listen = options.listen ?? tauriListen;
10
+ const workspaceEventName = options.workspaceEventName ?? 'draftline://workspace_event';
8
11
  async function run(command, args) {
9
12
  options.onCommandStart?.(command, args);
10
13
  try {
@@ -18,6 +21,13 @@ export function createDraftlineClient(options = {}) {
18
21
  }
19
22
  }
20
23
  return {
24
+ openWorkspace: (workspacePath) => run('open_workspace', {
25
+ request: { workspace_path: workspacePath },
26
+ }),
27
+ cloneWorkspace: (request) => run('clone_workspace', { request }),
28
+ adoptWorkspace: (workspacePath) => run('adopt_workspace', {
29
+ request: { workspace_path: workspacePath },
30
+ }),
21
31
  inspectWorkspace: (workspacePath) => run('inspect_workspace', {
22
32
  request: { workspace_path: workspacePath },
23
33
  }),
@@ -30,6 +40,44 @@ export function createDraftlineClient(options = {}) {
30
40
  listSupportRefs: (workspacePath, scope) => run('list_support_refs', {
31
41
  request: { workspace_path: workspacePath, scope },
32
42
  }),
43
+ listRemotes: (workspacePath) => run('list_remotes', {
44
+ request: { workspace_path: workspacePath },
45
+ }),
46
+ listRemoteVariations: (request) => run('list_remote_variations', { request }),
47
+ remoteVariationDiagnostics: (request) => run('remote_variation_diagnostics', { request }),
48
+ adoptRemoteVariation: (request) => run('adopt_remote_variation', { request }),
49
+ getChanges: (workspacePath) => run('get_changes', {
50
+ request: { workspace_path: workspacePath },
51
+ }),
52
+ getHistory: (workspacePath) => run('get_history', {
53
+ request: { workspace_path: workspacePath },
54
+ }),
55
+ getFullHistory: (workspacePath) => run('get_full_history', {
56
+ request: { workspace_path: workspacePath },
57
+ }),
58
+ diffVersions: (request) => run('diff_versions', { request }),
59
+ diffVersionToWorkspace: (request) => run('diff_version_to_workspace', { request }),
60
+ diffWorkspaceFile: (request) => run('diff_workspace_file', { request }),
61
+ previewVersion: (request) => run('preview_version', { request }),
62
+ previewVersionFile: (request) => run('preview_version_file', { request }),
63
+ previewWorkspaceFile: (request) => run('preview_workspace_file', { request }),
64
+ restoreVersionAsNewSave: (request) => run('restore_version_as_new_save', { request }),
65
+ save: (request) => run('save', { request }),
66
+ listShelves: (workspacePath) => run('list_shelves', {
67
+ request: { workspace_path: workspacePath },
68
+ }),
69
+ previewShelf: (request) => run('preview_shelf', { request }),
70
+ preflightApplyShelf: (request) => run('preflight_apply_shelf', { request }),
71
+ applyShelf: (request) => run('apply_shelf', { request }),
72
+ deleteShelf: (request) => run('delete_shelf', { request }),
73
+ auditContentPolicy: (workspacePath) => run('audit_content_policy', {
74
+ request: { workspace_path: workspacePath },
75
+ }),
76
+ clearStaleLock: (workspacePath) => run('clear_stale_lock', {
77
+ request: { workspace_path: workspacePath },
78
+ }),
79
+ repairRecovery: (request) => run('repair_recovery', { request }),
80
+ rollbackRecovery: (request) => run('rollback_recovery', { request }),
33
81
  selectedSave: (request) => run('selected_save', { request }),
34
82
  selectedShelve: (request) => run('selected_shelve', { request }),
35
83
  selectedDiscard: (request) => run('selected_discard', { request }),
@@ -39,8 +87,127 @@ export function createDraftlineClient(options = {}) {
39
87
  applyIncoming: (request) => run('apply_incoming', { request }),
40
88
  preflightMergeIncoming: (request) => run('preflight_merge_incoming', { request }),
41
89
  mergeIncoming: (request) => run('merge_incoming', { request }),
90
+ mergeIncomingWithResolutions: (request) => run('merge_incoming_with_resolutions', { request }),
91
+ subscribeWorkspaceEvents: (handler) => listen(workspaceEventName, (event) => handler(event.payload)),
92
+ };
93
+ }
94
+ export function createDraftlineHostFacade({ client = createDraftlineClient(), defaultRemote = 'origin', workspacePath, }) {
95
+ const workspaceRequest = () => ({ workspace_path: workspacePath });
96
+ const remoteRequest = (remote = defaultRemote) => ({ ...workspaceRequest(), remote });
97
+ const versionRequest = (versionId) => ({
98
+ ...workspaceRequest(),
99
+ version_id: versionId,
100
+ });
101
+ return {
102
+ workspacePath,
103
+ open: () => client.openWorkspace(workspacePath),
104
+ inspect: () => client.inspectWorkspace(workspacePath),
105
+ save: (label) => client.save({ ...workspaceRequest(), label }),
106
+ selectedSave: (paths, label) => client.selectedSave({ ...workspaceRequest(), paths, label }),
107
+ selectedShelve: (paths, name) => client.selectedShelve({ ...workspaceRequest(), paths, name }),
108
+ selectedDiscard: (paths) => client.selectedDiscard({ ...workspaceRequest(), paths }),
109
+ history: () => client.getHistory(workspacePath),
110
+ fullHistory: () => client.getFullHistory(workspacePath),
111
+ changes: () => client.getChanges(workspacePath),
112
+ variations: () => client.listVariations(workspacePath),
113
+ remotes: () => client.listRemotes(workspacePath),
114
+ supportRefs: (scope) => client.listSupportRefs(workspacePath, scope),
115
+ diffVersions: (fromVersionId, toVersionId) => client.diffVersions({
116
+ ...workspaceRequest(),
117
+ from_version_id: fromVersionId,
118
+ to_version_id: toVersionId,
119
+ }),
120
+ diffVersionToWorkspace: (versionId) => client.diffVersionToWorkspace(versionRequest(versionId)),
121
+ diffWorkspaceFile: (path) => client.diffWorkspaceFile({ ...workspaceRequest(), path }),
122
+ previewVersion: (versionId) => client.previewVersion(versionRequest(versionId)),
123
+ previewVersionFile: (versionId, path) => client.previewVersionFile({ ...versionRequest(versionId), path }),
124
+ previewWorkspaceFile: (path) => client.previewWorkspaceFile({ ...workspaceRequest(), path }),
125
+ restoreAsNewSave: (versionId, label) => client.restoreVersionAsNewSave({ ...versionRequest(versionId), label }),
126
+ shelves: () => client.listShelves(workspacePath),
127
+ previewShelf: (shelfId) => client.previewShelf({ ...workspaceRequest(), shelf_id: shelfId }),
128
+ applyShelf: (shelfId) => client.applyShelf({ ...workspaceRequest(), shelf_id: shelfId }),
129
+ repairRecovery: (operationId) => client.repairRecovery({ ...workspaceRequest(), operation_id: operationId }),
130
+ rollbackRecovery: (operationId) => client.rollbackRecovery({ ...workspaceRequest(), operation_id: operationId }),
131
+ fetchRemote: (remote) => client.fetchRemote(remoteRequest(remote)),
132
+ publishCurrentVariation: (remote) => client.publishCurrentVariation(remoteRequest(remote)),
133
+ preflightApplyIncoming: (remote) => client.preflightApplyIncoming(remoteRequest(remote)),
134
+ applyIncoming: (remote) => client.applyIncoming(remoteRequest(remote)),
135
+ preflightMergeIncoming: (remote) => client.preflightMergeIncoming(remoteRequest(remote)),
136
+ mergeIncoming: (label, remote) => client.mergeIncoming({ ...remoteRequest(remote), label }),
137
+ mergeIncomingWithResolutions: (label, token, resolutions, remote) => client.mergeIncomingWithResolutions({
138
+ ...remoteRequest(remote),
139
+ label,
140
+ resolutions,
141
+ token,
142
+ }),
143
+ remoteVariations: (remote) => client.listRemoteVariations(remoteRequest(remote)),
144
+ remoteVariationDiagnostics: (remote) => client.remoteVariationDiagnostics(remoteRequest(remote)),
145
+ adoptRemoteVariation: (variationId, remote) => client.adoptRemoteVariation({
146
+ ...remoteRequest(remote),
147
+ variation_id: variationId,
148
+ }),
42
149
  };
43
150
  }
151
+ export function createMergeConflictViewModel(report) {
152
+ const files = new Map();
153
+ for (const conflict of report.conflicts) {
154
+ const group = files.get(conflict.path) ??
155
+ {
156
+ field_conflicts: [],
157
+ label: conflict.path,
158
+ path: conflict.path,
159
+ whole_file_conflicts: [],
160
+ };
161
+ files.set(conflict.path, group);
162
+ if (conflict.field_path) {
163
+ let field = group.field_conflicts.find((candidate) => candidate.field_path === conflict.field_path);
164
+ if (!field) {
165
+ field = {
166
+ conflicts: [],
167
+ field_path: conflict.field_path,
168
+ label: conflict.label,
169
+ };
170
+ group.field_conflicts.push(field);
171
+ }
172
+ field.conflicts.push({ ...conflict });
173
+ }
174
+ else {
175
+ group.whole_file_conflicts.push({ ...conflict });
176
+ }
177
+ }
178
+ return {
179
+ can_merge_cleanly: report.can_merge_cleanly,
180
+ files: [...files.values()].sort((left, right) => left.path.localeCompare(right.path)),
181
+ token: report.token,
182
+ };
183
+ }
184
+ export function createWholeFileUseContentResolutions(report, source) {
185
+ return report.conflicts.flatMap((conflict) => {
186
+ if (conflict.field_path) {
187
+ return [];
188
+ }
189
+ const content = conflict[source];
190
+ if (content == null) {
191
+ return [];
192
+ }
193
+ return [
194
+ {
195
+ choice: { kind: 'use_content', content },
196
+ field_path: null,
197
+ path: conflict.path,
198
+ },
199
+ ];
200
+ });
201
+ }
202
+ export async function openWorkspace(workspacePath) {
203
+ return createDraftlineClient().openWorkspace(workspacePath);
204
+ }
205
+ export async function cloneWorkspace(request) {
206
+ return createDraftlineClient().cloneWorkspace(request);
207
+ }
208
+ export async function adoptWorkspace(workspacePath) {
209
+ return createDraftlineClient().adoptWorkspace(workspacePath);
210
+ }
44
211
  export async function inspectWorkspace(workspacePath) {
45
212
  return createDraftlineClient().inspectWorkspace(workspacePath);
46
213
  }
@@ -53,6 +220,78 @@ export async function listVariations(workspacePath) {
53
220
  export async function listSupportRefs(workspacePath, scope) {
54
221
  return createDraftlineClient().listSupportRefs(workspacePath, scope);
55
222
  }
223
+ export async function listRemotes(workspacePath) {
224
+ return createDraftlineClient().listRemotes(workspacePath);
225
+ }
226
+ export async function listRemoteVariations(request) {
227
+ return createDraftlineClient().listRemoteVariations(request);
228
+ }
229
+ export async function remoteVariationDiagnostics(request) {
230
+ return createDraftlineClient().remoteVariationDiagnostics(request);
231
+ }
232
+ export async function adoptRemoteVariation(request) {
233
+ return createDraftlineClient().adoptRemoteVariation(request);
234
+ }
235
+ export async function getChanges(workspacePath) {
236
+ return createDraftlineClient().getChanges(workspacePath);
237
+ }
238
+ export async function getHistory(workspacePath) {
239
+ return createDraftlineClient().getHistory(workspacePath);
240
+ }
241
+ export async function getFullHistory(workspacePath) {
242
+ return createDraftlineClient().getFullHistory(workspacePath);
243
+ }
244
+ export async function diffVersions(request) {
245
+ return createDraftlineClient().diffVersions(request);
246
+ }
247
+ export async function diffVersionToWorkspace(request) {
248
+ return createDraftlineClient().diffVersionToWorkspace(request);
249
+ }
250
+ export async function diffWorkspaceFile(request) {
251
+ return createDraftlineClient().diffWorkspaceFile(request);
252
+ }
253
+ export async function previewVersion(request) {
254
+ return createDraftlineClient().previewVersion(request);
255
+ }
256
+ export async function previewVersionFile(request) {
257
+ return createDraftlineClient().previewVersionFile(request);
258
+ }
259
+ export async function previewWorkspaceFile(request) {
260
+ return createDraftlineClient().previewWorkspaceFile(request);
261
+ }
262
+ export async function restoreVersionAsNewSave(request) {
263
+ return createDraftlineClient().restoreVersionAsNewSave(request);
264
+ }
265
+ export async function save(request) {
266
+ return createDraftlineClient().save(request);
267
+ }
268
+ export async function listShelves(workspacePath) {
269
+ return createDraftlineClient().listShelves(workspacePath);
270
+ }
271
+ export async function previewShelf(request) {
272
+ return createDraftlineClient().previewShelf(request);
273
+ }
274
+ export async function preflightApplyShelf(request) {
275
+ return createDraftlineClient().preflightApplyShelf(request);
276
+ }
277
+ export async function applyShelf(request) {
278
+ return createDraftlineClient().applyShelf(request);
279
+ }
280
+ export async function deleteShelf(request) {
281
+ return createDraftlineClient().deleteShelf(request);
282
+ }
283
+ export async function auditContentPolicy(workspacePath) {
284
+ return createDraftlineClient().auditContentPolicy(workspacePath);
285
+ }
286
+ export async function clearStaleLock(workspacePath) {
287
+ return createDraftlineClient().clearStaleLock(workspacePath);
288
+ }
289
+ export async function repairRecovery(request) {
290
+ return createDraftlineClient().repairRecovery(request);
291
+ }
292
+ export async function rollbackRecovery(request) {
293
+ return createDraftlineClient().rollbackRecovery(request);
294
+ }
56
295
  export async function selectedSave(request) {
57
296
  return createDraftlineClient().selectedSave(request);
58
297
  }
@@ -80,3 +319,6 @@ export async function preflightMergeIncoming(request) {
80
319
  export async function mergeIncoming(request) {
81
320
  return createDraftlineClient().mergeIncoming(request);
82
321
  }
322
+ export async function mergeIncomingWithResolutions(request) {
323
+ return createDraftlineClient().mergeIncomingWithResolutions(request);
324
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@draftline/client",
3
- "version": "0.1.1",
3
+ "version": "0.1.3",
4
4
  "description": "Typed Draftline client for Tauri host applications.",
5
5
  "license": "MIT",
6
6
  "type": "module",