@ibgib/vcs-gib 0.0.30 → 0.0.33

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 (216) hide show
  1. package/dist/AUTO-GENERATED-version.d.mts +1 -1
  2. package/dist/AUTO-GENERATED-version.mjs +1 -1
  3. package/dist/bootstrap/node-bootstrap.d.mts.map +1 -1
  4. package/dist/bootstrap/node-bootstrap.mjs +7 -21
  5. package/dist/bootstrap/node-bootstrap.mjs.map +1 -1
  6. package/dist/cli/commands/{add-cmd.d.mts → cli-add-cmd.d.mts} +3 -4
  7. package/dist/cli/commands/cli-add-cmd.d.mts.map +1 -0
  8. package/dist/cli/commands/cli-add-cmd.mjs +45 -0
  9. package/dist/cli/commands/cli-add-cmd.mjs.map +1 -0
  10. package/dist/cli/commands/{branch-cmd.d.mts → cli-branch-cmd.d.mts} +9 -9
  11. package/dist/cli/commands/cli-branch-cmd.d.mts.map +1 -0
  12. package/dist/cli/commands/cli-branch-cmd.mjs +59 -0
  13. package/dist/cli/commands/cli-branch-cmd.mjs.map +1 -0
  14. package/dist/cli/commands/cli-checkout-cmd.d.mts +20 -0
  15. package/dist/cli/commands/cli-checkout-cmd.d.mts.map +1 -0
  16. package/dist/cli/commands/cli-checkout-cmd.mjs +50 -0
  17. package/dist/cli/commands/cli-checkout-cmd.mjs.map +1 -0
  18. package/dist/cli/commands/cli-commit-cmd.d.mts +23 -0
  19. package/dist/cli/commands/cli-commit-cmd.d.mts.map +1 -0
  20. package/dist/cli/commands/cli-commit-cmd.mjs +52 -0
  21. package/dist/cli/commands/cli-commit-cmd.mjs.map +1 -0
  22. package/dist/cli/commands/{generate-comment-cmd.d.mts → cli-generate-comment-cmd.d.mts} +1 -1
  23. package/dist/cli/commands/cli-generate-comment-cmd.d.mts.map +1 -0
  24. package/dist/cli/commands/{generate-comment-cmd.mjs → cli-generate-comment-cmd.mjs} +11 -6
  25. package/dist/cli/commands/cli-generate-comment-cmd.mjs.map +1 -0
  26. package/dist/cli/commands/{init-cmd.d.mts → cli-init-cmd.d.mts} +3 -3
  27. package/dist/cli/commands/cli-init-cmd.d.mts.map +1 -0
  28. package/dist/cli/commands/cli-init-cmd.mjs +47 -0
  29. package/dist/cli/commands/cli-init-cmd.mjs.map +1 -0
  30. package/dist/cli/commands/{log-cmd.d.mts → cli-log-cmd.d.mts} +3 -4
  31. package/dist/cli/commands/cli-log-cmd.d.mts.map +1 -0
  32. package/dist/cli/commands/cli-log-cmd.mjs +90 -0
  33. package/dist/cli/commands/cli-log-cmd.mjs.map +1 -0
  34. package/dist/cli/commands/cli-merge-cmd.d.mts +22 -0
  35. package/dist/cli/commands/cli-merge-cmd.d.mts.map +1 -0
  36. package/dist/cli/commands/cli-merge-cmd.mjs +66 -0
  37. package/dist/cli/commands/cli-merge-cmd.mjs.map +1 -0
  38. package/dist/cli/commands/{reset-cmd.d.mts → cli-reset-cmd.d.mts} +2 -2
  39. package/dist/cli/commands/cli-reset-cmd.d.mts.map +1 -0
  40. package/dist/cli/commands/cli-reset-cmd.mjs +63 -0
  41. package/dist/cli/commands/cli-reset-cmd.mjs.map +1 -0
  42. package/dist/cli/commands/cli-restore-cmd.d.mts +23 -0
  43. package/dist/cli/commands/cli-restore-cmd.d.mts.map +1 -0
  44. package/dist/cli/commands/cli-restore-cmd.mjs +55 -0
  45. package/dist/cli/commands/cli-restore-cmd.mjs.map +1 -0
  46. package/dist/cli/commands/{status-cmd.d.mts → cli-status-cmd.d.mts} +3 -3
  47. package/dist/cli/commands/cli-status-cmd.d.mts.map +1 -0
  48. package/dist/cli/commands/cli-status-cmd.mjs +96 -0
  49. package/dist/cli/commands/cli-status-cmd.mjs.map +1 -0
  50. package/dist/cli/vcs-cli-main.d.mts.map +1 -1
  51. package/dist/cli/vcs-cli-main.mjs +18 -15
  52. package/dist/cli/vcs-cli-main.mjs.map +1 -1
  53. package/dist/cli/vcs-projection-helper.d.mts +23 -0
  54. package/dist/cli/vcs-projection-helper.d.mts.map +1 -0
  55. package/dist/cli/vcs-projection-helper.mjs +91 -0
  56. package/dist/cli/vcs-projection-helper.mjs.map +1 -0
  57. package/dist/cli/vcs-repo-helper.d.mts +19 -0
  58. package/dist/cli/vcs-repo-helper.d.mts.map +1 -0
  59. package/dist/cli/vcs-repo-helper.mjs +74 -0
  60. package/dist/cli/vcs-repo-helper.mjs.map +1 -0
  61. package/dist/test/test-helpers.d.mts +11 -2
  62. package/dist/test/test-helpers.d.mts.map +1 -1
  63. package/dist/test/test-helpers.mjs +35 -0
  64. package/dist/test/test-helpers.mjs.map +1 -1
  65. package/package.json +6 -6
  66. package/src/AUTO-GENERATED-version.mts +1 -1
  67. package/src/bootstrap/node-bootstrap.mts +7 -21
  68. package/src/bootstrap/node-bootstrap.respec.mts +2 -2
  69. package/src/cli/cli-arg-parser.respec.mts +2 -2
  70. package/src/cli/cli-e2e.respec.mts +12 -12
  71. package/src/cli/commands/branch-checkout-cmd.respec.mts +426 -412
  72. package/src/cli/commands/cli-add-cmd.mts +65 -0
  73. package/src/cli/commands/cli-branch-cmd.mts +87 -0
  74. package/src/cli/commands/cli-checkout-cmd.mts +72 -0
  75. package/src/cli/commands/cli-commit-cmd.mts +77 -0
  76. package/src/cli/commands/{generate-comment-cmd.mts → cli-generate-comment-cmd.mts} +12 -6
  77. package/src/cli/commands/cli-init-cmd.mts +78 -0
  78. package/src/cli/commands/cli-log-cmd.mts +126 -0
  79. package/src/cli/commands/cli-merge-cmd.mts +99 -0
  80. package/src/cli/commands/cli-reset-cmd.mts +94 -0
  81. package/src/cli/commands/cli-restore-cmd.mts +87 -0
  82. package/src/cli/commands/cli-status-cmd.mts +131 -0
  83. package/src/cli/commands/commit-log-cmd.respec.mts +85 -28
  84. package/src/cli/commands/init-cmd.respec.mts +3 -3
  85. package/src/cli/commands/reset-restore-cmd.respec.mts +9 -9
  86. package/src/cli/commands/status-add-cmd.respec.mts +21 -17
  87. package/src/cli/vcs-cli-main.mts +18 -15
  88. package/src/cli/vcs-projection-helper.mts +112 -0
  89. package/src/cli/vcs-repo-helper.mts +99 -0
  90. package/src/engine/branch/branch-space.respec.mts +23 -21
  91. package/src/engine/merge/b2tfs-sync-comments.respec.mts +11 -11
  92. package/src/test/test-helpers.mts +50 -2
  93. package/src/vcs-gib.respec.mts +25 -16
  94. package/tsconfig.test.tsbuildinfo +1 -1
  95. package/tsconfig.tsbuildinfo +1 -1
  96. package/vcs-gib_test_output.md +58 -0
  97. package/dist/cli/commands/add-cmd.d.mts.map +0 -1
  98. package/dist/cli/commands/add-cmd.mjs +0 -346
  99. package/dist/cli/commands/add-cmd.mjs.map +0 -1
  100. package/dist/cli/commands/branch-cmd.d.mts.map +0 -1
  101. package/dist/cli/commands/branch-cmd.mjs +0 -238
  102. package/dist/cli/commands/branch-cmd.mjs.map +0 -1
  103. package/dist/cli/commands/checkout-cmd.d.mts +0 -21
  104. package/dist/cli/commands/checkout-cmd.d.mts.map +0 -1
  105. package/dist/cli/commands/checkout-cmd.mjs +0 -174
  106. package/dist/cli/commands/checkout-cmd.mjs.map +0 -1
  107. package/dist/cli/commands/commit-cmd.d.mts +0 -24
  108. package/dist/cli/commands/commit-cmd.d.mts.map +0 -1
  109. package/dist/cli/commands/commit-cmd.mjs +0 -449
  110. package/dist/cli/commands/commit-cmd.mjs.map +0 -1
  111. package/dist/cli/commands/generate-comment-cmd.d.mts.map +0 -1
  112. package/dist/cli/commands/generate-comment-cmd.mjs.map +0 -1
  113. package/dist/cli/commands/init-cmd.d.mts.map +0 -1
  114. package/dist/cli/commands/init-cmd.mjs +0 -119
  115. package/dist/cli/commands/init-cmd.mjs.map +0 -1
  116. package/dist/cli/commands/log-cmd.d.mts.map +0 -1
  117. package/dist/cli/commands/log-cmd.mjs +0 -349
  118. package/dist/cli/commands/log-cmd.mjs.map +0 -1
  119. package/dist/cli/commands/merge-cmd.d.mts +0 -36
  120. package/dist/cli/commands/merge-cmd.d.mts.map +0 -1
  121. package/dist/cli/commands/merge-cmd.mjs +0 -292
  122. package/dist/cli/commands/merge-cmd.mjs.map +0 -1
  123. package/dist/cli/commands/reset-cmd.d.mts.map +0 -1
  124. package/dist/cli/commands/reset-cmd.mjs +0 -93
  125. package/dist/cli/commands/reset-cmd.mjs.map +0 -1
  126. package/dist/cli/commands/restore-cmd.d.mts +0 -22
  127. package/dist/cli/commands/restore-cmd.d.mts.map +0 -1
  128. package/dist/cli/commands/restore-cmd.mjs +0 -115
  129. package/dist/cli/commands/restore-cmd.mjs.map +0 -1
  130. package/dist/cli/commands/status-cmd.d.mts.map +0 -1
  131. package/dist/cli/commands/status-cmd.mjs +0 -132
  132. package/dist/cli/commands/status-cmd.mjs.map +0 -1
  133. package/dist/engine/branch/branch-graph-helper.d.mts +0 -28
  134. package/dist/engine/branch/branch-graph-helper.d.mts.map +0 -1
  135. package/dist/engine/branch/branch-graph-helper.mjs +0 -81
  136. package/dist/engine/branch/branch-graph-helper.mjs.map +0 -1
  137. package/dist/engine/branch/branch-helper.d.mts +0 -40
  138. package/dist/engine/branch/branch-helper.d.mts.map +0 -1
  139. package/dist/engine/branch/branch-helper.mjs +0 -78
  140. package/dist/engine/branch/branch-helper.mjs.map +0 -1
  141. package/dist/engine/branch/branch-space-helper.d.mts +0 -23
  142. package/dist/engine/branch/branch-space-helper.d.mts.map +0 -1
  143. package/dist/engine/branch/branch-space-helper.mjs +0 -78
  144. package/dist/engine/branch/branch-space-helper.mjs.map +0 -1
  145. package/dist/engine/branch/branch-types.d.mts +0 -26
  146. package/dist/engine/branch/branch-types.d.mts.map +0 -1
  147. package/dist/engine/branch/branch-types.mjs +0 -7
  148. package/dist/engine/branch/branch-types.mjs.map +0 -1
  149. package/dist/engine/diff/line-diff-helper.d.mts +0 -76
  150. package/dist/engine/diff/line-diff-helper.d.mts.map +0 -1
  151. package/dist/engine/diff/line-diff-helper.mjs +0 -144
  152. package/dist/engine/diff/line-diff-helper.mjs.map +0 -1
  153. package/dist/engine/filter/glob-helper.d.mts +0 -51
  154. package/dist/engine/filter/glob-helper.d.mts.map +0 -1
  155. package/dist/engine/filter/glob-helper.mjs +0 -132
  156. package/dist/engine/filter/glob-helper.mjs.map +0 -1
  157. package/dist/engine/index/index-helper.d.mts +0 -113
  158. package/dist/engine/index/index-helper.d.mts.map +0 -1
  159. package/dist/engine/index/index-helper.mjs +0 -533
  160. package/dist/engine/index/index-helper.mjs.map +0 -1
  161. package/dist/engine/index/index-types.d.mts +0 -63
  162. package/dist/engine/index/index-types.d.mts.map +0 -1
  163. package/dist/engine/index/index-types.mjs +0 -7
  164. package/dist/engine/index/index-types.mjs.map +0 -1
  165. package/dist/engine/item/item-atom-helper.d.mts +0 -20
  166. package/dist/engine/item/item-atom-helper.d.mts.map +0 -1
  167. package/dist/engine/item/item-atom-helper.mjs +0 -30
  168. package/dist/engine/item/item-atom-helper.mjs.map +0 -1
  169. package/dist/engine/item/item-helper.d.mts +0 -94
  170. package/dist/engine/item/item-helper.d.mts.map +0 -1
  171. package/dist/engine/item/item-helper.mjs +0 -424
  172. package/dist/engine/item/item-helper.mjs.map +0 -1
  173. package/dist/engine/item/item-types.d.mts +0 -128
  174. package/dist/engine/item/item-types.d.mts.map +0 -1
  175. package/dist/engine/item/item-types.mjs +0 -16
  176. package/dist/engine/item/item-types.mjs.map +0 -1
  177. package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts +0 -74
  178. package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts.map +0 -1
  179. package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs +0 -570
  180. package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map +0 -1
  181. package/dist/engine/merge/b2tfs-3way-graft-types.d.mts +0 -34
  182. package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map +0 -1
  183. package/dist/engine/merge/b2tfs-3way-graft-types.mjs +0 -2
  184. package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map +0 -1
  185. package/dist/engine/status/status-helper.d.mts +0 -90
  186. package/dist/engine/status/status-helper.d.mts.map +0 -1
  187. package/dist/engine/status/status-helper.mjs +0 -286
  188. package/dist/engine/status/status-helper.mjs.map +0 -1
  189. package/src/cli/commands/add-cmd.mts +0 -435
  190. package/src/cli/commands/branch-cmd.mts +0 -311
  191. package/src/cli/commands/checkout-cmd.mts +0 -227
  192. package/src/cli/commands/commit-cmd.mts +0 -557
  193. package/src/cli/commands/init-cmd.mts +0 -152
  194. package/src/cli/commands/log-cmd.mts +0 -449
  195. package/src/cli/commands/merge-cmd.mts +0 -363
  196. package/src/cli/commands/reset-cmd.mts +0 -128
  197. package/src/cli/commands/restore-cmd.mts +0 -155
  198. package/src/cli/commands/status-cmd.mts +0 -168
  199. package/src/engine/branch/branch-graph-helper.mts +0 -117
  200. package/src/engine/branch/branch-helper.mts +0 -112
  201. package/src/engine/branch/branch-space-helper.mts +0 -110
  202. package/src/engine/branch/branch-types.mts +0 -29
  203. package/src/engine/diff/line-diff-helper.mts +0 -210
  204. package/src/engine/diff/line-diff-helper.respec.mts +0 -84
  205. package/src/engine/filter/glob-helper.mts +0 -165
  206. package/src/engine/filter/glob-helper.respec.mts +0 -94
  207. package/src/engine/index/index-helper.mts +0 -705
  208. package/src/engine/index/index-types.mts +0 -66
  209. package/src/engine/item/item-atom-helper.mts +0 -30
  210. package/src/engine/item/item-helper.mts +0 -544
  211. package/src/engine/item/item-types.mts +0 -137
  212. package/src/engine/item/item.respec.mts +0 -92
  213. package/src/engine/merge/b2tfs-3way-graft-strategy.mts +0 -630
  214. package/src/engine/merge/b2tfs-3way-graft-strategy.respec.mts +0 -346
  215. package/src/engine/merge/b2tfs-3way-graft-types.mts +0 -34
  216. package/src/engine/status/status-helper.mts +0 -383
@@ -1,128 +0,0 @@
1
- /**
2
- * @module item-types
3
- *
4
- * Baseline type definitions for B2tFS filesystem item IbGibs.
5
- */
6
- import { IbGibAddr, TransformResult } from '@ibgib/ts-gib/dist/types.mjs';
7
- import { IbGibData_V1, IbGibRel8ns_V1, IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
8
- import { CommentIbGib_V1 } from '@ibgib/core-gib/dist/common/comment/comment-types.mjs';
9
- import { SpaceQualifiedIbGibAddr } from '../index/index-types.mjs';
10
- import { LineDiffChunk } from '../diff/line-diff-helper.mjs';
11
- /**
12
- * Filesystem projection type: file or folder.
13
- */
14
- export type B2tFSType = 'file' | 'folder';
15
- export declare const B2tFSType: {
16
- file: 'file';
17
- folder: 'folder';
18
- };
19
- export declare const B2TFS_TYPE_VALUES: B2tFSType[];
20
- /**
21
- * Rel8n names used by B2tFS items.
22
- */
23
- export declare const B2TFS_CHILD_ITEM_REL8N_NAME = "b2tfs_child";
24
- export declare const BINARY_REL8N_NAME = "bin";
25
- /**
26
- * Intrinsic data payload for B2tFS item IbGibs.
27
- */
28
- export interface B2tFSItemData_V1 extends IbGibData_V1 {
29
- /**
30
- * Raw filesystem name of file or folder (e.g. 'index.mts')
31
- */
32
- name: string;
33
- /**
34
- * SHA-256 hash of raw name
35
- */
36
- nameHash: string;
37
- /**
38
- * Filesystem item type ('file' | 'folder')
39
- */
40
- fsType: B2tFSType;
41
- /**
42
- * Filter patterns for folders (e.g. from .ibgibignore)
43
- */
44
- filterPatterns?: string[];
45
- /**
46
- * File name sans extension
47
- */
48
- fileNameSansExt?: string;
49
- /**
50
- * File extension (e.g. 'mts')
51
- */
52
- fileExt?: string;
53
- /**
54
- * SHA-256 hash of file contents
55
- */
56
- fileHash?: string;
57
- /**
58
- * File encoding (defaults to 'utf8')
59
- */
60
- fileEncoding?: string;
61
- /**
62
- * Grouping UUID for atomic diff transactions
63
- */
64
- diffTransactionId: string;
65
- }
66
- /**
67
- * Extrinsic relationships (DAG links) for B2tFS item IbGibs.
68
- */
69
- export interface B2tFSItemRel8ns_V1 extends IbGibRel8ns_V1 {
70
- /**
71
- * Links to child B2tFS item addresses (for folders)
72
- */
73
- [B2TFS_CHILD_ITEM_REL8N_NAME]?: IbGibAddr[];
74
- /**
75
- * Links to binary content payload IbGibs (for files)
76
- */
77
- [BINARY_REL8N_NAME]?: IbGibAddr[];
78
- /**
79
- * Links to commit message comment IbGibs
80
- */
81
- comment?: IbGibAddr[];
82
- }
83
- /**
84
- * B2tFS Item IbGib object structure.
85
- */
86
- export interface B2tFSItemIbGib_V1 extends IbGib_V1<B2tFSItemData_V1, B2tFSItemRel8ns_V1> {
87
- data: B2tFSItemData_V1;
88
- }
89
- /**
90
- * Diff information tree structure.
91
- */
92
- export interface B2tFSItemDiffInfo {
93
- fsType?: B2tFSType;
94
- fsName?: string;
95
- timestampInTicks: string;
96
- diffTransactionId: string;
97
- existingItemSQAddr?: SpaceQualifiedIbGibAddr;
98
- newItemSQAddr?: SpaceQualifiedIbGibAddr;
99
- existingItem?: B2tFSItemIbGib_V1;
100
- newItem?: B2tFSItemIbGib_V1;
101
- transformResults?: TransformResult<IbGib_V1>[];
102
- applyCommentText?: string;
103
- applyCommentIbGib?: CommentIbGib_V1;
104
- childDiffs?: B2tFSItemDiffInfo[];
105
- errorMsg?: string;
106
- ignored?: boolean;
107
- inputPath?: string;
108
- }
109
- export interface B2tFSItemDiffInfo_Folder extends B2tFSItemDiffInfo {
110
- fsType: 'folder';
111
- childNamesAdded: string[];
112
- childAddrsAdded: string[];
113
- childNamesRemoved: string[];
114
- childAddrsRemoved: string[];
115
- childNamesModified: string[];
116
- childAddrsModified: {
117
- [prevAddr: string]: string;
118
- };
119
- filterPatterns: string[];
120
- }
121
- export interface B2tFSItemDiffInfo_File extends B2tFSItemDiffInfo {
122
- fsType: 'file';
123
- fileEncoding?: string;
124
- oldData?: Uint8Array;
125
- newData: Uint8Array;
126
- lineChunks?: LineDiffChunk[];
127
- }
128
- //# sourceMappingURL=item-types.d.mts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"item-types.d.mts","sourceRoot":"","sources":["../../../src/engine/item/item-types.mts"],"names":[],"mappings":"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"}
@@ -1,16 +0,0 @@
1
- /**
2
- * @module item-types
3
- *
4
- * Baseline type definitions for B2tFS filesystem item IbGibs.
5
- */
6
- export const B2tFSType = {
7
- file: 'file',
8
- folder: 'folder',
9
- };
10
- export const B2TFS_TYPE_VALUES = Object.values(B2tFSType);
11
- /**
12
- * Rel8n names used by B2tFS items.
13
- */
14
- export const B2TFS_CHILD_ITEM_REL8N_NAME = 'b2tfs_child';
15
- export const BINARY_REL8N_NAME = 'bin';
16
- //# sourceMappingURL=item-types.mjs.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"item-types.mjs","sourceRoot":"","sources":["../../../src/engine/item/item-types.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAcH,MAAM,CAAC,MAAM,SAAS,GAAG;IACrB,IAAI,EAAE,MAAgB;IACtB,MAAM,EAAE,QAAoB;CACQ,CAAC;AAEzC,MAAM,CAAC,MAAM,iBAAiB,GAAgB,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAEvE;;GAEG;AACH,MAAM,CAAC,MAAM,2BAA2B,GAAG,aAAa,CAAC;AACzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,CAAC"}
@@ -1,74 +0,0 @@
1
- /**
2
- * @module b2tfs-3way-graft-strategy
3
- *
4
- * ============================================================================
5
- * ⚠️ CRITICAL GRAFT STRATEGY GUIDANCE WARNING ⚠️
6
- * BEFORE MAKING ANY CHANGES TO THIS FILE, YOU MUST CONSULT AND CAREFULLY READ:
7
- * libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md
8
- *
9
- * Graft strategies must strictly fulfill the `GraftTimelinesResult` contract,
10
- * ensure timeline `n` monotonicity (using Math.max over base/orphan branch frames),
11
- * and include ALL newly referenced ancillary dependency nodes (comments, binary
12
- * stones, DNAs) in `ancillaryIbGibsCreated` so that the destination branch
13
- * space is completely self-contained.
14
- * ============================================================================
15
- *
16
- * 3-way text line diff graft strategy for B2tFS file item timelines.
17
- * Reconciles diverging file content via 3-way line diff (LCA, Base, Orphan)
18
- * and inserts Git conflict markers when line edits collide.
19
- *
20
- * Non-text binaries and non-file items return early / false in `canGraft` and
21
- * fall through to `DefaultDnaReplayGraftStrategy`.
22
- * Folder hierarchies are re-synchronized post-merge via `reifyB2tFSHierarchy`.
23
- */
24
- import { GraftMergeStrategyBase_V1 } from '@ibgib/core-gib/dist/sync/graft-info/graft-merge-strategy-base-v1.mjs';
25
- import { GraftContext, GraftStrategy, GraftTimelinesResult } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs';
26
- /**
27
- * 3-way text line diff merge result.
28
- */
29
- export interface Text3WayMergeResult {
30
- mergedText: string;
31
- hasConflict: boolean;
32
- }
33
- /**
34
- * Performs 3-way line diff merging across LCA, Base, and Orphan text lines.
35
- * Inserts Git conflict markers (`<<<<<<< HEAD`, `=======`, `>>>>>>>`) when overlapping
36
- * line changes conflict.
37
- */
38
- export declare function perform3WayTextLineMerge({ textLCA, textBase, textOrphan, }: {
39
- textLCA: string;
40
- textBase: string;
41
- textOrphan: string;
42
- }): Text3WayMergeResult;
43
- /**
44
- * 3-way text line diff graft strategy for B2tFS file item timelines.
45
- *
46
- * ⚠️ **IMPORTANT**: Before making ANY changes to this class or its methods, consult:
47
- * `libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md`.
48
- */
49
- export declare class B2tFS3WayGraftStrategy extends GraftMergeStrategyBase_V1 implements GraftStrategy {
50
- readonly strategyId: string;
51
- private lc;
52
- /**
53
- * Returns true only if the graft context has two tips that are text-based file b2tfs item ibgibs.
54
- *
55
- * @param context info about the divergent timelines {@link GraftContext}
56
- * @returns true if it's a text file item ibgib, else false
57
- */
58
- canGraft(context: GraftContext): Promise<boolean>;
59
- /**
60
- * Executes 3-way line diff text graft across LCA, Base, and Orphan file items.
61
- *
62
- * ⚠️ **CRITICAL CONTRACT**: Before modifying this method, review:
63
- * `libs/core-gib/src/sync/GRAFT_STRATEGY_GUIDANCE.md`
64
- * Ensure:
65
- * 1. Monotonic `n` counter (`highestDataN = Math.max(...)`)
66
- * 2. Full dependency graph inclusion in `ancillaryIbGibsCreated` (comments, bin stones, DNAs)
67
- * 3. Self-contained destination branch space
68
- */
69
- graft(context: GraftContext): Promise<GraftTimelinesResult | undefined>;
70
- private fetchIbGib;
71
- private resolveRootItemNode;
72
- private getFilePayloadBuffer;
73
- }
74
- //# sourceMappingURL=b2tfs-3way-graft-strategy.d.mts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"b2tfs-3way-graft-strategy.d.mts","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-strategy.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAQH,OAAO,EAAE,yBAAyB,EAAE,MAAM,uEAAuE,CAAC;AAClH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,2DAA2D,CAAC;AAqB9H;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,EACrC,OAAO,EACP,QAAQ,EACR,UAAU,GACb,EAAE;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACtB,GAAG,mBAAmB,CA2FtB;AAED;;;;;GAKG;AACH,qBAAa,sBAAuB,SAAQ,yBAA0B,YAAW,aAAa;IAC1F,QAAQ,CAAC,UAAU,EAAE,MAAM,CAA4B;IACvD,OAAO,CAAC,EAAE,CAA8B;IAExC;;;;;OAKG;IACG,QAAQ,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,CAgDtD;IAED;;;;;;;;;OASG;IACG,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAkS5E;YAEa,UAAU;YA4BV,mBAAmB;YA0BnB,oBAAoB;CAyCrC"}