@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,9 +1,8 @@
1
1
  /**
2
2
  * @module log-cmd
3
3
  *
4
- * Command handler for `vcs log`.
5
- * Reads active branch timeline from B2tFSIndexIbGib_V1 in localSpace,
6
- * walks branch or item timeline history backward, and displays formatted commit and comment history.
4
+ * CLI command handler for `vcs log`.
5
+ * Delegates to executeVcsLog and formats console output.
7
6
  */
8
7
  export interface VcsLogItem {
9
8
  branchAddr?: string;
@@ -33,4 +32,4 @@ export interface LogCmdResult {
33
32
  commits: VcsLogItem[];
34
33
  }
35
34
  export declare function executeLogCmd({ targetDir, vcsFolderName, filePath, allComments, quiet, }?: LogCmdOpts): Promise<LogCmdResult>;
36
- //# sourceMappingURL=log-cmd.d.mts.map
35
+ //# sourceMappingURL=cli-log-cmd.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,EAChC,SAAyB,EACzB,aAAyB,EACzB,QAAQ,EACR,WAAmB,EACnB,KAAa,GAChB,GAAE,UAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CA0EzC"}
@@ -0,0 +1,90 @@
1
+ /**
2
+ * @module log-cmd
3
+ *
4
+ * CLI command handler for `vcs log`.
5
+ * Delegates to executeVcsLog and formats console output.
6
+ */
7
+ import path from 'node:path';
8
+ import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
+ // import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
10
+ import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
11
+ import { openVcsRepository } from '../vcs-repo-helper.mjs';
12
+ const lcFile = `[log-cmd]`;
13
+ const logalot = GLOBAL_LOG_A_LOT;
14
+ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', filePath, allComments = false, quiet = false, } = {}) {
15
+ const lc = `${lcFile}[${executeLogCmd.name}]`;
16
+ try {
17
+ if (logalot) {
18
+ console.log(`${lc} starting executeLogCmd (I: genuuid)`);
19
+ }
20
+ const absTargetDir = path.resolve(targetDir);
21
+ const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
22
+ const indexIbGib = await repo.getIndexIbGib();
23
+ const activeBranchSpace = await repo.getActiveBranchSpace(indexIbGib);
24
+ const logRes = await repo.log({
25
+ activeBranchSpace,
26
+ indexIbGib,
27
+ // repoRoot, // need this? we need jsdocs on wth repoRoot is
28
+ filePath,
29
+ allComments,
30
+ targetDir: absTargetDir,
31
+ });
32
+ const commits = logRes.commits;
33
+ if (!quiet) {
34
+ if (logRes.targetPath) {
35
+ console.log(`File: ${logRes.targetPath} (branch: ${logRes.branchName}) (I: genuuid)`);
36
+ if (commits.length === 0) {
37
+ console.log('No comments found for this file.');
38
+ }
39
+ else {
40
+ for (const commit of commits) {
41
+ console.log(`\nitem ${commit.commitAddr}`);
42
+ if (commit.timestamp) {
43
+ console.log(`Date: ${commit.timestamp}`);
44
+ }
45
+ console.log(`\n ${commit.message}\n`);
46
+ }
47
+ }
48
+ }
49
+ else {
50
+ console.log(`Branch: ${logRes.branchName} (I: genuuid)`);
51
+ if (commits.length === 0) {
52
+ console.log('No commits yet.');
53
+ }
54
+ else {
55
+ for (const commit of commits) {
56
+ console.log(`\ncommit ${commit.commitAddr}`);
57
+ console.log(`Author: ${commit.author}`);
58
+ console.log(`Date: ${commit.timestamp}`);
59
+ console.log(`\n ${commit.message}\n`);
60
+ if (commit.committedPaths && commit.committedPaths.length > 0) {
61
+ console.log(`Changed: ${commit.committedPaths.join(', ')}`);
62
+ }
63
+ if (commit.itemComments && commit.itemComments.length > 0) {
64
+ console.log('Item Comments:');
65
+ for (const ic of commit.itemComments) {
66
+ const label = ic.name ? `${ic.path} (${ic.name})` : ic.path;
67
+ console.log(` * [${label}]: ${ic.message}`);
68
+ }
69
+ }
70
+ }
71
+ }
72
+ }
73
+ }
74
+ return {
75
+ branchName: logRes.branchName,
76
+ targetPath: logRes.targetPath,
77
+ commits,
78
+ };
79
+ }
80
+ catch (error) {
81
+ console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
82
+ throw error;
83
+ }
84
+ finally {
85
+ if (logalot) {
86
+ console.log(`${lc} complete. (I: genuuid)`);
87
+ }
88
+ }
89
+ }
90
+ //# sourceMappingURL=cli-log-cmd.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"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"}
@@ -0,0 +1,22 @@
1
+ /**
2
+ * @module merge-cmd
3
+ *
4
+ * CLI command handler for `vcs merge <branchName>`.
5
+ * Merges incoming branch into base branch and delegates to executeVcsMerge.
6
+ */
7
+ export interface MergeCmdOpts {
8
+ incomingBranchName?: string;
9
+ targetDir?: string;
10
+ vcsFolderName?: string;
11
+ quiet?: boolean;
12
+ }
13
+ export interface MergeCmdResult {
14
+ baseBranch: string;
15
+ incomingBranch: string;
16
+ baseSpaceId: string;
17
+ incomingSpaceId: string;
18
+ mergedBranchAddr?: string;
19
+ worktreePath: string;
20
+ }
21
+ export declare function executeMergeCmd({ incomingBranchName, targetDir, vcsFolderName, quiet, }?: MergeCmdOpts): Promise<MergeCmdResult>;
22
+ //# sourceMappingURL=cli-merge-cmd.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAcH,MAAM,WAAW,YAAY;IACzB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,eAAe,CAAC,EAClC,kBAAkB,EAClB,SAAyB,EACzB,aAAyB,EACzB,KAAa,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CA0D7C"}
@@ -0,0 +1,66 @@
1
+ /**
2
+ * @module merge-cmd
3
+ *
4
+ * CLI command handler for `vcs merge <branchName>`.
5
+ * Merges incoming branch into base branch and delegates to executeVcsMerge.
6
+ */
7
+ import path from 'node:path';
8
+ import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
+ import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
10
+ import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
11
+ import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
12
+ import { openVcsRepository } from '../vcs-repo-helper.mjs';
13
+ const lcFile = `[merge-cmd]`;
14
+ const logalot = GLOBAL_LOG_A_LOT;
15
+ export async function executeMergeCmd({ incomingBranchName, targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, } = {}) {
16
+ const lc = `${lcFile}[${executeMergeCmd.name}]`;
17
+ try {
18
+ if (logalot) {
19
+ console.log(`${lc} starting... (I: genuuid)`);
20
+ }
21
+ const trimmedIncomingBranchName = incomingBranchName?.trim();
22
+ if (!trimmedIncomingBranchName) {
23
+ throw new Error(`Branch name is required for merge (E: genuuid)`);
24
+ }
25
+ const absTargetDir = path.resolve(targetDir);
26
+ const { repo, vcsPath, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
27
+ // todo: get baseBranchName based off of targetDir?
28
+ const baseBranchName = await repo.getActiveBranchName();
29
+ const incomingSpaceRes = await getOrCreateBranchSpace({
30
+ metaspace: repo.metaspace,
31
+ branchName: trimmedIncomingBranchName,
32
+ });
33
+ const activeBranchSpace = await repo.getActiveBranchSpace();
34
+ const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
35
+ const mergeRes = await repo.merge({
36
+ baseBranchSpace: activeBranchSpace, // what should this be? always the active one? Or does the working dir determine it? What is absTargetDir?
37
+ // message,
38
+ // repoRoot,
39
+ incomingBranchName: trimmedIncomingBranchName,
40
+ incomingBranchSpace: incomingSpaceRes.space,
41
+ targetDir: absTargetDir,
42
+ });
43
+ if (!quiet) {
44
+ console.log(`Successfully merged branch '${trimmedIncomingBranchName}' into '${baseBranchName}' (I: genuuid)`);
45
+ console.log(` Worktree projection: ${activeWorktreeDir}`);
46
+ }
47
+ return {
48
+ baseBranch: mergeRes.baseBranch,
49
+ incomingBranch: mergeRes.incomingBranch,
50
+ baseSpaceId: activeBranchSpaceId,
51
+ incomingSpaceId: incomingSpaceRes.spaceId,
52
+ mergedBranchAddr: mergeRes.mergeCommitAddr,
53
+ worktreePath: activeWorktreeDir,
54
+ };
55
+ }
56
+ catch (error) {
57
+ console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
58
+ throw error;
59
+ }
60
+ finally {
61
+ if (logalot) {
62
+ console.log(`${lc} complete. (I: genuuid)`);
63
+ }
64
+ }
65
+ }
66
+ //# sourceMappingURL=cli-merge-cmd.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-merge-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  /**
2
2
  * @module reset-cmd
3
3
  *
4
- * Command handler for `vcs reset [path...]`.
4
+ * CLI command handler for `vcs reset [path...]`.
5
5
  * Unstages specified files (or all files) from active branch index in localSpace.
6
6
  */
7
7
  export interface ResetCmdOpts {
@@ -18,4 +18,4 @@ export interface ResetCmdResult {
18
18
  stagedCount: number;
19
19
  }
20
20
  export declare function executeResetCmd({ paths, targetDir, vcsFolderName, all, yes, force, quiet, }?: ResetCmdOpts): Promise<ResetCmdResult>;
21
- //# sourceMappingURL=reset-cmd.d.mts.map
21
+ //# sourceMappingURL=cli-reset-cmd.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-reset-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-reset-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,MAAM,WAAW,YAAY;IACzB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,wBAAsB,eAAe,CAAC,EAClC,KAAU,EACV,SAAyB,EACzB,aAAyB,EACzB,GAAW,EACX,GAAW,EACX,KAAa,EACb,KAAa,GAChB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoD7C"}
@@ -0,0 +1,63 @@
1
+ /**
2
+ * @module reset-cmd
3
+ *
4
+ * CLI command handler for `vcs reset [path...]`.
5
+ * Unstages specified files (or all files) from active branch index in localSpace.
6
+ */
7
+ import path from 'node:path';
8
+ import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
+ import { promptForConfirm } from '@ibgib/helper-gib/dist/helpers/node-helper.mjs';
10
+ import { openVcsRepository } from '../vcs-repo-helper.mjs';
11
+ import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
12
+ const lcFile = `[reset-cmd]`;
13
+ const logalot = GLOBAL_LOG_A_LOT;
14
+ export async function executeResetCmd({ paths = [], targetDir = process.cwd(), vcsFolderName = '.vcsgib', all = false, yes = false, force = false, quiet = false, } = {}) {
15
+ const lc = `${lcFile}[${executeResetCmd.name}]`;
16
+ try {
17
+ if (logalot) {
18
+ console.log(`${lc} starting... (I: genuuid)`);
19
+ }
20
+ const absTargetDir = path.resolve(targetDir);
21
+ const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
22
+ const indexIbGib = await repo.getIndexIbGib();
23
+ const activeBranchSpace = await repo.getActiveBranchSpace(indexIbGib);
24
+ const skipPrompt = yes || force || quiet || !process.stdin.isTTY;
25
+ if (!skipPrompt) {
26
+ const confirmed = await promptForConfirm({ msg: 'Unstage specified files from index?' });
27
+ if (!confirmed) {
28
+ if (!quiet) {
29
+ console.log('Operation cancelled.');
30
+ }
31
+ const stagedCount = Object.keys(indexIbGib.data.stagedPaths || {}).length;
32
+ return { unstagedPaths: [], stagedCount };
33
+ }
34
+ }
35
+ const resetRes = await repo.reset({
36
+ activeBranchSpace,
37
+ indexIbGib,
38
+ paths,
39
+ all,
40
+ targetDir: absTargetDir,
41
+ activeWorktreeDir,
42
+ });
43
+ if (!quiet) {
44
+ for (const unstagedPath of resetRes.unstagedPaths) {
45
+ console.log(`unstaged: ${unstagedPath}`);
46
+ }
47
+ }
48
+ return {
49
+ unstagedPaths: resetRes.unstagedPaths,
50
+ stagedCount: resetRes.stagedCount,
51
+ };
52
+ }
53
+ catch (error) {
54
+ console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
55
+ throw error;
56
+ }
57
+ finally {
58
+ if (logalot) {
59
+ console.log(`${lc} complete. (I: genuuid)`);
60
+ }
61
+ }
62
+ }
63
+ //# sourceMappingURL=cli-reset-cmd.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-reset-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-reset-cmd.mts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ /**
2
+ * @module restore-cmd
3
+ *
4
+ * CLI command handler for `vcs restore [path...]`.
5
+ * Delegates to executeVcsRestore and formats terminal output.
6
+ */
7
+ export interface RestoreCmdOpts {
8
+ paths?: string[];
9
+ staged?: boolean;
10
+ worktree?: boolean;
11
+ all?: boolean;
12
+ yes?: boolean;
13
+ force?: boolean;
14
+ targetDir?: string;
15
+ vcsFolderName?: string;
16
+ quiet?: boolean;
17
+ }
18
+ export interface RestoreCmdResult {
19
+ restoredPaths: string[];
20
+ unstagedPaths: string[];
21
+ }
22
+ export declare function executeRestoreCmd({ paths, staged, worktree, all, yes, force, targetDir, vcsFolderName, quiet, }?: RestoreCmdOpts): Promise<RestoreCmdResult>;
23
+ //# sourceMappingURL=cli-restore-cmd.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-restore-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,MAAM,WAAW,cAAc;IAC3B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE,MAAM,EAAE,CAAC;CAC3B;AAED,wBAAsB,iBAAiB,CAAC,EACpC,KAAU,EACV,MAAc,EACd,QAAgB,EAChB,GAAW,EACX,GAAW,EACX,KAAa,EACb,SAAyB,EACzB,aAAyB,EACzB,KAAa,GAChB,GAAE,cAAmB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0CjD"}
@@ -0,0 +1,55 @@
1
+ /**
2
+ * @module restore-cmd
3
+ *
4
+ * CLI command handler for `vcs restore [path...]`.
5
+ * Delegates to executeVcsRestore and formats terminal output.
6
+ */
7
+ import path from 'node:path';
8
+ import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
+ import { openVcsRepository } from '../vcs-repo-helper.mjs';
10
+ import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
11
+ const lcFile = `[restore-cmd]`;
12
+ const logalot = GLOBAL_LOG_A_LOT;
13
+ export async function executeRestoreCmd({ paths = [], staged = false, worktree = false, all = false, yes = false, force = false, targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, } = {}) {
14
+ const lc = `${lcFile}[${executeRestoreCmd.name}]`;
15
+ try {
16
+ if (logalot) {
17
+ console.log(`${lc} starting... (I: genuuid)`);
18
+ }
19
+ const absTargetDir = path.resolve(targetDir);
20
+ const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
21
+ const restoreRes = await repo.restore({
22
+ paths,
23
+ staged,
24
+ all,
25
+ targetDir: absTargetDir,
26
+ activeWorktreeDir,
27
+ });
28
+ if (!quiet) {
29
+ if (staged) {
30
+ for (const unstagedPath of restoreRes.unstagedPaths) {
31
+ console.log(`unstaged: ${unstagedPath}`);
32
+ }
33
+ }
34
+ else {
35
+ for (const restoredPath of restoreRes.restoredPaths) {
36
+ console.log(`restored: ${restoredPath}`);
37
+ }
38
+ }
39
+ }
40
+ return {
41
+ restoredPaths: restoreRes.restoredPaths,
42
+ unstagedPaths: restoreRes.unstagedPaths,
43
+ };
44
+ }
45
+ catch (error) {
46
+ console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
47
+ throw error;
48
+ }
49
+ finally {
50
+ if (logalot) {
51
+ console.log(`${lc} complete. (I: genuuid)`);
52
+ }
53
+ }
54
+ }
55
+ //# sourceMappingURL=cli-restore-cmd.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-restore-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,eAAe,CAAC;AAC/B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAmBjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACpC,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,EAChB,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAmB,EAAE;IAClB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC;IAClD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,2BAA2B,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAExG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAClC,KAAK;YACL,MAAM;YACN,GAAG;YACH,SAAS,EAAE,YAAY;YACvB,iBAAiB;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,IAAI,MAAM,EAAE,CAAC;gBACT,KAAK,MAAM,YAAY,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,YAAY,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,aAAa,EAAE,UAAU,CAAC,aAAa;YACvC,aAAa,EAAE,UAAU,CAAC,aAAa;SAC1C,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,yBAAyB,CAAC,CAAC;QAChD,CAAC;IACL,CAAC;AACL,CAAC"}
@@ -1,10 +1,10 @@
1
1
  /**
2
2
  * @module status-cmd
3
3
  *
4
- * Command handler for `vcs status`.
4
+ * CLI command handler for `vcs status`.
5
5
  * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
6
6
  */
7
- import { VcsStatusItem, PendingCommentInfo } from '../../engine/status/status-helper.mjs';
7
+ import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-helper.mjs';
8
8
  export { VcsStatusItem, PendingCommentInfo };
9
9
  export interface StatusCmdResult {
10
10
  branchName: string;
@@ -21,4 +21,4 @@ export interface StatusCmdOpts {
21
21
  comments?: boolean;
22
22
  }
23
23
  export declare function executeStatusCmd({ targetDir, vcsFolderName, quiet, comments, }?: StatusCmdOpts): Promise<StatusCmdResult>;
24
- //# sourceMappingURL=status-cmd.d.mts.map
24
+ //# sourceMappingURL=cli-status-cmd.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAOtG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,eAAe,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,QAAgB,GACnB,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA0F/C"}
@@ -0,0 +1,96 @@
1
+ /**
2
+ * @module status-cmd
3
+ *
4
+ * CLI command handler for `vcs status`.
5
+ * Compares physical workspace state against active branch snapshot tip and in-band index staging area.
6
+ */
7
+ import path from 'node:path';
8
+ import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
+ import { openVcsRepository } from '../vcs-repo-helper.mjs';
10
+ import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
11
+ const lcFile = `[status-cmd]`;
12
+ const logalot = GLOBAL_LOG_A_LOT;
13
+ export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, comments = false, } = {}) {
14
+ const lc = `${lcFile}[${executeStatusCmd.name}]`;
15
+ try {
16
+ if (logalot) {
17
+ console.log(`${lc} starting executeStatusCmd (I: 7a8b9c10d11e12f13a14b15c16d17e18)`);
18
+ }
19
+ const absTargetDir = path.resolve(targetDir);
20
+ const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
21
+ const statusRes = await repo.status({
22
+ targetDir: absTargetDir,
23
+ });
24
+ const { staged, modified, deleted, untracked, pendingComments } = statusRes;
25
+ const commentsByTarget = new Map();
26
+ for (const c of pendingComments) {
27
+ const list = commentsByTarget.get(c.targetRelPath) || [];
28
+ list.push(c);
29
+ commentsByTarget.set(c.targetRelPath, list);
30
+ }
31
+ if (!quiet) {
32
+ console.log(`On branch ${statusRes.branchName} (I: 5e6f7a8b9c10d11e12f13a14b15c16d1)`);
33
+ if (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0 && pendingComments.length === 0) {
34
+ console.log('nothing to commit, working tree clean');
35
+ }
36
+ else {
37
+ if (staged.length > 0) {
38
+ console.log('\nChanges to be committed:');
39
+ console.log(' (use "vcs reset <file>..." to unstage)');
40
+ for (const item of staged) {
41
+ const typePrefix = item.fsType === 'folder' ? 'directory: ' : '';
42
+ console.log(`\tnew file: ${typePrefix}${item.path}`);
43
+ }
44
+ }
45
+ if (modified.length > 0 || deleted.length > 0) {
46
+ console.log('\nChanges not staged for commit:');
47
+ console.log(' (use "vcs add <file>..." to update what will be committed)');
48
+ console.log(' (use "vcs restore <file>..." to discard changes in working directory)');
49
+ for (const item of modified) {
50
+ console.log(`\tmodified: ${item.path}`);
51
+ }
52
+ for (const item of deleted) {
53
+ console.log(`\tdeleted: ${item.path}`);
54
+ }
55
+ }
56
+ if (untracked.length > 0) {
57
+ console.log('\nUntracked files:');
58
+ console.log(' (use "vcs add <file>..." to include in what will be committed)');
59
+ for (const item of untracked) {
60
+ const suffix = item.fsType === 'folder' ? '/' : '';
61
+ console.log(`\t${item.path}${suffix}`);
62
+ }
63
+ }
64
+ if (pendingComments.length > 0) {
65
+ console.log('\nPending companion comments:');
66
+ console.log(' (will be attached to items upon "vcs commit")');
67
+ for (const comment of pendingComments) {
68
+ const targetLabel = comment.targetRelPath ? comment.targetRelPath : '(root)';
69
+ console.log(`\tcomment on [${targetLabel}]: ${comment.commentRelPath}`);
70
+ if (comments) {
71
+ console.log(`\t Preview: ${comment.content.slice(0, 80).replace(/\n/g, ' ')}...`);
72
+ }
73
+ }
74
+ }
75
+ }
76
+ }
77
+ return {
78
+ branchName: statusRes.branchName,
79
+ staged,
80
+ modified,
81
+ deleted,
82
+ untracked,
83
+ pendingComments,
84
+ };
85
+ }
86
+ catch (error) {
87
+ console.error(`${lc} ${extractErrorMsg(error)} (E: 6f7a8b9c10d11e12f13a14b15c16d17e)`);
88
+ throw error;
89
+ }
90
+ finally {
91
+ if (logalot) {
92
+ console.log(`${lc} complete. (I: 8a9b10c11d12e13f14a15b16c17d18e1)`);
93
+ }
94
+ }
95
+ }
96
+ //# sourceMappingURL=cli-status-cmd.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-status-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAoBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,EACb,QAAQ,GAAG,KAAK,GACnB,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IAEjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kEAAkE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAErF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAChC,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;QAE5E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAgC,CAAC;QACjE,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACb,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,aAAa,SAAS,CAAC,UAAU,wCAAwC,CAAC,CAAC;YAEvF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjI,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACJ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;oBACxD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;wBACxB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;wBACjE,OAAO,CAAC,GAAG,CAAC,iBAAiB,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC3D,CAAC;gBACL,CAAC;gBAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC5C,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;oBAChD,OAAO,CAAC,GAAG,CAAC,8DAA8D,CAAC,CAAC;oBAC5E,OAAO,CAAC,GAAG,CAAC,yEAAyE,CAAC,CAAC;oBACvF,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;wBAC1B,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC9C,CAAC;oBACD,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;wBACzB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;oBAC9C,CAAC;gBACL,CAAC;gBAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACvB,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;oBAClC,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;oBAChF,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;wBAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;wBACnD,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,IAAI,GAAG,MAAM,EAAE,CAAC,CAAC;oBAC3C,CAAC;gBACL,CAAC;gBAED,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7B,OAAO,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,iDAAiD,CAAC,CAAC;oBAC/D,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE,CAAC;wBACpC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;wBAC7E,OAAO,CAAC,GAAG,CAAC,iBAAiB,WAAW,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;wBACxE,IAAI,QAAQ,EAAE,CAAC;4BACX,OAAO,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;wBACvF,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,MAAM;YACN,QAAQ;YACR,OAAO;YACP,SAAS;YACT,eAAe;SAClB,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAmHpC"}
1
+ {"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsHpC"}
@@ -8,17 +8,17 @@
8
8
  import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
9
9
  import { parseVcsArgs } from './cli-arg-parser.mjs';
10
10
  import { VCS_SUBCOMMANDS } from './cli-constants.mjs';
11
- import { executeInitCmd } from './commands/init-cmd.mjs';
12
- import { executeStatusCmd } from './commands/status-cmd.mjs';
13
- import { executeAddCmd } from './commands/add-cmd.mjs';
14
- import { executeCommitCmd } from './commands/commit-cmd.mjs';
15
- import { executeLogCmd } from './commands/log-cmd.mjs';
16
- import { executeBranchCmd } from './commands/branch-cmd.mjs';
17
- import { executeCheckoutCmd } from './commands/checkout-cmd.mjs';
18
- import { executeMergeCmd } from './commands/merge-cmd.mjs';
19
- import { executeResetCmd } from './commands/reset-cmd.mjs';
20
- import { executeRestoreCmd } from './commands/restore-cmd.mjs';
21
- import { executeGenerateCommentCmd } from './commands/generate-comment-cmd.mjs';
11
+ import { executeInitCmd } from './commands/cli-init-cmd.mjs';
12
+ import { executeStatusCmd } from './commands/cli-status-cmd.mjs';
13
+ import { executeAddCmd } from './commands/cli-add-cmd.mjs';
14
+ import { executeCommitCmd } from './commands/cli-commit-cmd.mjs';
15
+ import { executeLogCmd } from './commands/cli-log-cmd.mjs';
16
+ import { executeBranchCmd } from './commands/cli-branch-cmd.mjs';
17
+ import { executeCheckoutCmd } from './commands/cli-checkout-cmd.mjs';
18
+ import { executeMergeCmd } from './commands/cli-merge-cmd.mjs';
19
+ import { executeResetCmd } from './commands/cli-reset-cmd.mjs';
20
+ import { executeRestoreCmd } from './commands/cli-restore-cmd.mjs';
21
+ import { executeGenerateCommentCmd } from './commands/cli-generate-comment-cmd.mjs';
22
22
  import { AUTO_GENERATED_VERSION } from '../AUTO-GENERATED-version.mjs';
23
23
  import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
24
24
  const lcFile = `[vcs-cli-main]`;
@@ -64,7 +64,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
64
64
  const lc = `${lcFile}[${main.name}]`;
65
65
  try {
66
66
  if (logalot) {
67
- console.log(`${lc} starting... (I: 4b5c6d7e8f9a0b1c2d3e4f5a6b7c8d9e)`);
67
+ console.log(`${lc} starting... (I: genuuid)`);
68
68
  }
69
69
  const parsed = parseVcsArgs(argv);
70
70
  if (parsed.flags.help) {
@@ -125,7 +125,10 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
125
125
  }
126
126
  case VCS_SUBCOMMANDS.CHECKOUT: {
127
127
  const branchName = parsed.positionals[0] || parsed.flags.branchName;
128
- await executeCheckoutCmd({ branchName });
128
+ await executeCheckoutCmd({
129
+ branchName,
130
+ force: parsed.flags.force,
131
+ });
129
132
  break;
130
133
  }
131
134
  case VCS_SUBCOMMANDS.MERGE: {
@@ -165,12 +168,12 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
165
168
  return 0;
166
169
  }
167
170
  catch (error) {
168
- console.error(`Error: ${extractErrorMsg(error)} (E: 8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d)`);
171
+ console.error(`Error: ${extractErrorMsg(error)} (E: genuuid)`);
169
172
  return 1;
170
173
  }
171
174
  finally {
172
175
  if (logalot) {
173
- console.log(`${lc} complete. (I: 9f0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c)`);
176
+ console.log(`${lc} complete. (I: genuuid)`);
174
177
  }
175
178
  }
176
179
  }
@@ -1 +1 @@
1
- {"version":3,"file":"vcs-cli-main.mjs","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"vcs-cli-main.mjs","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":"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"}