@ibgib/vcs-gib 0.0.30 → 0.0.32
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/dist/AUTO-GENERATED-version.d.mts +1 -1
- package/dist/AUTO-GENERATED-version.mjs +1 -1
- package/dist/bootstrap/node-bootstrap.mjs +1 -1
- package/dist/bootstrap/node-bootstrap.mjs.map +1 -1
- package/dist/cli/commands/add-cmd.d.mts +2 -3
- package/dist/cli/commands/add-cmd.d.mts.map +1 -1
- package/dist/cli/commands/add-cmd.mjs +30 -283
- package/dist/cli/commands/add-cmd.mjs.map +1 -1
- package/dist/cli/commands/branch-cmd.d.mts +8 -8
- package/dist/cli/commands/branch-cmd.d.mts.map +1 -1
- package/dist/cli/commands/branch-cmd.mjs +45 -176
- package/dist/cli/commands/branch-cmd.mjs.map +1 -1
- package/dist/cli/commands/checkout-cmd.d.mts +2 -4
- package/dist/cli/commands/checkout-cmd.d.mts.map +1 -1
- package/dist/cli/commands/checkout-cmd.mjs +31 -110
- package/dist/cli/commands/checkout-cmd.mjs.map +1 -1
- package/dist/cli/commands/commit-cmd.d.mts +7 -8
- package/dist/cli/commands/commit-cmd.d.mts.map +1 -1
- package/dist/cli/commands/commit-cmd.mjs +40 -390
- package/dist/cli/commands/commit-cmd.mjs.map +1 -1
- package/dist/cli/commands/generate-comment-cmd.d.mts.map +1 -1
- package/dist/cli/commands/generate-comment-cmd.mjs +5 -2
- package/dist/cli/commands/generate-comment-cmd.mjs.map +1 -1
- package/dist/cli/commands/init-cmd.d.mts +2 -2
- package/dist/cli/commands/init-cmd.d.mts.map +1 -1
- package/dist/cli/commands/init-cmd.mjs +20 -70
- package/dist/cli/commands/init-cmd.mjs.map +1 -1
- package/dist/cli/commands/log-cmd.d.mts +2 -3
- package/dist/cli/commands/log-cmd.d.mts.map +1 -1
- package/dist/cli/commands/log-cmd.mjs +42 -271
- package/dist/cli/commands/log-cmd.mjs.map +1 -1
- package/dist/cli/commands/merge-cmd.d.mts +3 -17
- package/dist/cli/commands/merge-cmd.d.mts.map +1 -1
- package/dist/cli/commands/merge-cmd.mjs +32 -218
- package/dist/cli/commands/merge-cmd.mjs.map +1 -1
- package/dist/cli/commands/reset-cmd.d.mts +1 -1
- package/dist/cli/commands/reset-cmd.d.mts.map +1 -1
- package/dist/cli/commands/reset-cmd.mjs +17 -19
- package/dist/cli/commands/reset-cmd.mjs.map +1 -1
- package/dist/cli/commands/restore-cmd.d.mts +8 -7
- package/dist/cli/commands/restore-cmd.d.mts.map +1 -1
- package/dist/cli/commands/restore-cmd.mjs +44 -62
- package/dist/cli/commands/restore-cmd.mjs.map +1 -1
- package/dist/cli/commands/status-cmd.d.mts +2 -2
- package/dist/cli/commands/status-cmd.d.mts.map +1 -1
- package/dist/cli/commands/status-cmd.mjs +63 -62
- package/dist/cli/commands/status-cmd.mjs.map +1 -1
- package/dist/cli/vcs-projection-helper.d.mts +23 -0
- package/dist/cli/vcs-projection-helper.d.mts.map +1 -0
- package/dist/cli/vcs-projection-helper.mjs +91 -0
- package/dist/cli/vcs-projection-helper.mjs.map +1 -0
- package/dist/test/test-helpers.d.mts +2 -2
- package/dist/test/test-helpers.d.mts.map +1 -1
- package/package.json +3 -3
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +1 -1
- package/src/cli/cli-e2e.respec.mts +4 -4
- package/src/cli/commands/add-cmd.mts +32 -347
- package/src/cli/commands/branch-cmd.mts +56 -225
- package/src/cli/commands/checkout-cmd.mts +34 -138
- package/src/cli/commands/commit-cmd.mts +46 -473
- package/src/cli/commands/commit-log-cmd.respec.mts +11 -7
- package/src/cli/commands/generate-comment-cmd.mts +6 -2
- package/src/cli/commands/init-cmd.mts +20 -73
- package/src/cli/commands/log-cmd.mts +41 -331
- package/src/cli/commands/merge-cmd.mts +32 -252
- package/src/cli/commands/reset-cmd.mts +17 -19
- package/src/cli/commands/restore-cmd.mts +52 -72
- package/src/cli/commands/status-add-cmd.respec.mts +3 -3
- package/src/cli/commands/status-cmd.mts +68 -63
- package/src/cli/vcs-projection-helper.mts +112 -0
- package/src/engine/branch/branch-space.respec.mts +5 -5
- package/src/engine/merge/b2tfs-sync-comments.respec.mts +4 -4
- package/src/test/test-helpers.mts +2 -2
- package/src/vcs-gib.respec.mts +11 -8
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/engine/branch/branch-graph-helper.d.mts +0 -28
- package/dist/engine/branch/branch-graph-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-graph-helper.mjs +0 -81
- package/dist/engine/branch/branch-graph-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-helper.d.mts +0 -40
- package/dist/engine/branch/branch-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-helper.mjs +0 -78
- package/dist/engine/branch/branch-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-space-helper.d.mts +0 -23
- package/dist/engine/branch/branch-space-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-space-helper.mjs +0 -78
- package/dist/engine/branch/branch-space-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-types.d.mts +0 -26
- package/dist/engine/branch/branch-types.d.mts.map +0 -1
- package/dist/engine/branch/branch-types.mjs +0 -7
- package/dist/engine/branch/branch-types.mjs.map +0 -1
- package/dist/engine/diff/line-diff-helper.d.mts +0 -76
- package/dist/engine/diff/line-diff-helper.d.mts.map +0 -1
- package/dist/engine/diff/line-diff-helper.mjs +0 -144
- package/dist/engine/diff/line-diff-helper.mjs.map +0 -1
- package/dist/engine/filter/glob-helper.d.mts +0 -51
- package/dist/engine/filter/glob-helper.d.mts.map +0 -1
- package/dist/engine/filter/glob-helper.mjs +0 -132
- package/dist/engine/filter/glob-helper.mjs.map +0 -1
- package/dist/engine/index/index-helper.d.mts +0 -113
- package/dist/engine/index/index-helper.d.mts.map +0 -1
- package/dist/engine/index/index-helper.mjs +0 -533
- package/dist/engine/index/index-helper.mjs.map +0 -1
- package/dist/engine/index/index-types.d.mts +0 -63
- package/dist/engine/index/index-types.d.mts.map +0 -1
- package/dist/engine/index/index-types.mjs +0 -7
- package/dist/engine/index/index-types.mjs.map +0 -1
- package/dist/engine/item/item-atom-helper.d.mts +0 -20
- package/dist/engine/item/item-atom-helper.d.mts.map +0 -1
- package/dist/engine/item/item-atom-helper.mjs +0 -30
- package/dist/engine/item/item-atom-helper.mjs.map +0 -1
- package/dist/engine/item/item-helper.d.mts +0 -94
- package/dist/engine/item/item-helper.d.mts.map +0 -1
- package/dist/engine/item/item-helper.mjs +0 -424
- package/dist/engine/item/item-helper.mjs.map +0 -1
- package/dist/engine/item/item-types.d.mts +0 -128
- package/dist/engine/item/item-types.d.mts.map +0 -1
- package/dist/engine/item/item-types.mjs +0 -16
- package/dist/engine/item/item-types.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts +0 -74
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs +0 -570
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts +0 -34
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs +0 -2
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map +0 -1
- package/dist/engine/status/status-helper.d.mts +0 -90
- package/dist/engine/status/status-helper.d.mts.map +0 -1
- package/dist/engine/status/status-helper.mjs +0 -286
- package/dist/engine/status/status-helper.mjs.map +0 -1
- package/src/engine/branch/branch-graph-helper.mts +0 -117
- package/src/engine/branch/branch-helper.mts +0 -112
- package/src/engine/branch/branch-space-helper.mts +0 -110
- package/src/engine/branch/branch-types.mts +0 -29
- package/src/engine/diff/line-diff-helper.mts +0 -210
- package/src/engine/diff/line-diff-helper.respec.mts +0 -84
- package/src/engine/filter/glob-helper.mts +0 -165
- package/src/engine/filter/glob-helper.respec.mts +0 -94
- package/src/engine/index/index-helper.mts +0 -705
- package/src/engine/index/index-types.mts +0 -66
- package/src/engine/item/item-atom-helper.mts +0 -30
- package/src/engine/item/item-helper.mts +0 -544
- package/src/engine/item/item-types.mts +0 -137
- package/src/engine/item/item.respec.mts +0 -92
- package/src/engine/merge/b2tfs-3way-graft-strategy.mts +0 -630
- package/src/engine/merge/b2tfs-3way-graft-strategy.respec.mts +0 -346
- package/src/engine/merge/b2tfs-3way-graft-types.mts +0 -34
- package/src/engine/status/status-helper.mts +0 -383
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restore-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"restore-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/restore-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module status-cmd
|
|
3
3
|
*
|
|
4
|
-
*
|
|
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 '
|
|
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;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAYtG,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,CA6H/C"}
|
|
@@ -1,15 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module status-cmd
|
|
3
3
|
*
|
|
4
|
-
*
|
|
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
7
|
import path from 'node:path';
|
|
8
8
|
import fs from 'node:fs/promises';
|
|
9
9
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
10
|
+
import { executeVcsStatus } from '@ibgib/core-gib/dist/vcs/commands/status-cmd.mjs';
|
|
11
|
+
import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
|
|
10
12
|
import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
|
|
13
|
+
import { getOrCreateBranchSpace } from '@ibgib/node-gib/dist/vcs/branch-space-helper.mjs';
|
|
14
|
+
import { getOrCreateWorkspaceProjectionSpace } from '@ibgib/node-gib/dist/vcs/workspace-space-helper.mjs';
|
|
15
|
+
import { readVcsIndexProjectionFromDisk } from '../vcs-projection-helper.mjs';
|
|
11
16
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
12
|
-
import { getRepoStatus } from '../../engine/status/status-helper.mjs';
|
|
13
17
|
const lcFile = `[status-cmd]`;
|
|
14
18
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
15
19
|
export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', quiet = false, comments = false, } = {}) {
|
|
@@ -30,15 +34,31 @@ export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderNam
|
|
|
30
34
|
catch {
|
|
31
35
|
throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 4d5e6f7a8b9c10d11e12f13a14b15c6d)`);
|
|
32
36
|
}
|
|
33
|
-
const
|
|
37
|
+
const indexIbGib = await readVcsIndexProjectionFromDisk({ vcsPath, space: localSpace });
|
|
38
|
+
const branchName = resolveContextualBranchName({ targetDir: absTargetDir, repoRoot, indexIbGib });
|
|
39
|
+
const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
|
|
40
|
+
const { space: activeBranchSpace } = await getOrCreateBranchSpace({
|
|
34
41
|
metaspace,
|
|
35
|
-
localSpace,
|
|
36
42
|
vcsPath,
|
|
43
|
+
branchName,
|
|
44
|
+
});
|
|
45
|
+
const { space: workspaceSpace } = await getOrCreateWorkspaceProjectionSpace({
|
|
46
|
+
metaspace,
|
|
47
|
+
workspaceRoot: activeWorktreeDir,
|
|
48
|
+
vcsFolderName,
|
|
49
|
+
backingSpace: activeBranchSpace,
|
|
50
|
+
});
|
|
51
|
+
const statusRes = await executeVcsStatus({
|
|
52
|
+
metaspace,
|
|
53
|
+
localSpace,
|
|
54
|
+
activeBranchSpace,
|
|
55
|
+
workspaceSpace,
|
|
56
|
+
indexIbGib,
|
|
37
57
|
repoRoot,
|
|
38
58
|
targetDir: absTargetDir,
|
|
39
59
|
vcsFolderName,
|
|
40
60
|
});
|
|
41
|
-
const {
|
|
61
|
+
const { staged, modified, deleted, untracked, pendingComments } = statusRes;
|
|
42
62
|
const commentsByTarget = new Map();
|
|
43
63
|
for (const c of pendingComments) {
|
|
44
64
|
const list = commentsByTarget.get(c.targetRelPath) || [];
|
|
@@ -46,72 +66,53 @@ export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderNam
|
|
|
46
66
|
commentsByTarget.set(c.targetRelPath, list);
|
|
47
67
|
}
|
|
48
68
|
if (!quiet) {
|
|
49
|
-
console.log(`On branch ${branchName} (I:
|
|
50
|
-
if (staged.length
|
|
51
|
-
console.log('
|
|
52
|
-
for (const item of staged) {
|
|
53
|
-
const itemComments = commentsByTarget.get(item.path) || [];
|
|
54
|
-
console.log(` staged: ${item.path}`);
|
|
55
|
-
if (itemComments.length === 0) {
|
|
56
|
-
console.log(` (hint: no comment file found for ${item.path} - run 'vcs gmsg')`);
|
|
57
|
-
}
|
|
58
|
-
else if (comments) {
|
|
59
|
-
for (const comm of itemComments) {
|
|
60
|
-
console.log(` [comment: ${comm.commentRelPath}]`);
|
|
61
|
-
const lines = comm.content.trim().split('\n');
|
|
62
|
-
for (const line of lines) {
|
|
63
|
-
console.log(` ${line}`);
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
69
|
+
console.log(`On branch ${statusRes.branchName} (I: 5e6f7a8b9c10d11e12f13a14b15c16d1)`);
|
|
70
|
+
if (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0 && pendingComments.length === 0) {
|
|
71
|
+
console.log('nothing to commit, working tree clean');
|
|
68
72
|
}
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
console.log(` [comment: ${comm.commentRelPath}]`);
|
|
77
|
-
const lines = comm.content.trim().split('\n');
|
|
78
|
-
for (const line of lines) {
|
|
79
|
-
console.log(` ${line}`);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
73
|
+
else {
|
|
74
|
+
if (staged.length > 0) {
|
|
75
|
+
console.log('\nChanges to be committed:');
|
|
76
|
+
console.log(' (use "vcs reset <file>..." to unstage)');
|
|
77
|
+
for (const item of staged) {
|
|
78
|
+
const typePrefix = item.fsType === 'folder' ? 'directory: ' : '';
|
|
79
|
+
console.log(`\tnew file: ${typePrefix}${item.path}`);
|
|
82
80
|
}
|
|
83
81
|
}
|
|
84
|
-
|
|
85
|
-
console.log(
|
|
82
|
+
if (modified.length > 0 || deleted.length > 0) {
|
|
83
|
+
console.log('\nChanges not staged for commit:');
|
|
84
|
+
console.log(' (use "vcs add <file>..." to update what will be committed)');
|
|
85
|
+
console.log(' (use "vcs restore <file>..." to discard changes in working directory)');
|
|
86
|
+
for (const item of modified) {
|
|
87
|
+
console.log(`\tmodified: ${item.path}`);
|
|
88
|
+
}
|
|
89
|
+
for (const item of deleted) {
|
|
90
|
+
console.log(`\tdeleted: ${item.path}`);
|
|
91
|
+
}
|
|
86
92
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
93
|
+
if (untracked.length > 0) {
|
|
94
|
+
console.log('\nUntracked files:');
|
|
95
|
+
console.log(' (use "vcs add <file>..." to include in what will be committed)');
|
|
96
|
+
for (const item of untracked) {
|
|
97
|
+
const suffix = item.fsType === 'folder' ? '/' : '';
|
|
98
|
+
console.log(`\t${item.path}${suffix}`);
|
|
99
|
+
}
|
|
92
100
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
if (comments) {
|
|
102
|
-
const lines = fc.content.trim().split('\n');
|
|
103
|
-
for (const line of lines) {
|
|
104
|
-
console.log(` ${line}`);
|
|
101
|
+
if (pendingComments.length > 0) {
|
|
102
|
+
console.log('\nPending companion comments:');
|
|
103
|
+
console.log(' (will be attached to items upon "vcs commit")');
|
|
104
|
+
for (const comment of pendingComments) {
|
|
105
|
+
const targetLabel = comment.targetRelPath ? comment.targetRelPath : '(root)';
|
|
106
|
+
console.log(`\tcomment on [${targetLabel}]: ${comment.commentRelPath}`);
|
|
107
|
+
if (comments) {
|
|
108
|
+
console.log(`\t Preview: ${comment.content.slice(0, 80).replace(/\n/g, ' ')}...`);
|
|
105
109
|
}
|
|
106
110
|
}
|
|
107
111
|
}
|
|
108
112
|
}
|
|
109
|
-
if (staged.length === 0 && modified.length === 0 && deleted.length === 0 && untracked.length === 0) {
|
|
110
|
-
console.log('nothing to commit, working tree clean');
|
|
111
|
-
}
|
|
112
113
|
}
|
|
113
114
|
return {
|
|
114
|
-
branchName,
|
|
115
|
+
branchName: statusRes.branchName,
|
|
115
116
|
staged,
|
|
116
117
|
modified,
|
|
117
118
|
deleted,
|
|
@@ -120,12 +121,12 @@ export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderNam
|
|
|
120
121
|
};
|
|
121
122
|
}
|
|
122
123
|
catch (error) {
|
|
123
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
124
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 6f7a8b9c10d11e12f13a14b15c16d17e)`);
|
|
124
125
|
throw error;
|
|
125
126
|
}
|
|
126
127
|
finally {
|
|
127
128
|
if (logalot) {
|
|
128
|
-
console.log(`${lc} complete. (I:
|
|
129
|
+
console.log(`${lc} complete. (I: 8a9b10c11d12e13f14a15b16c17d18e1)`);
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"status-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/status-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module vcs-projection-helper
|
|
3
|
+
*
|
|
4
|
+
* CLI-specific filesystem projection helpers for reading and writing `.vcsgib/vcs_index_projection.json`.
|
|
5
|
+
* Strictly housed in `apps/vcs-gib` CLI layer to maintain pure isolation from `core-gib`.
|
|
6
|
+
*/
|
|
7
|
+
import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
|
|
8
|
+
import { B2tFSIndexIbGib_V1 } from '@ibgib/core-gib/dist/vcs/index/index-types.mjs';
|
|
9
|
+
/**
|
|
10
|
+
* Retrieves authoritative B2tFSIndexIbGib_V1 from space by reading the `.vcsgib/vcs_index_projection.json` pointer on disk.
|
|
11
|
+
*/
|
|
12
|
+
export declare function readVcsIndexProjectionFromDisk({ vcsPath, space, }: {
|
|
13
|
+
vcsPath: string;
|
|
14
|
+
space: IbGibSpaceAny;
|
|
15
|
+
}): Promise<B2tFSIndexIbGib_V1 | undefined>;
|
|
16
|
+
/**
|
|
17
|
+
* Writes read-only JSON projection cache of repository index to disk.
|
|
18
|
+
*/
|
|
19
|
+
export declare function writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib, }: {
|
|
20
|
+
vcsPath: string;
|
|
21
|
+
indexIbGib: B2tFSIndexIbGib_V1;
|
|
22
|
+
}): Promise<void>;
|
|
23
|
+
//# sourceMappingURL=vcs-projection-helper.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vcs-projection-helper.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-projection-helper.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,OAAO,EAAE,aAAa,EAAE,MAAM,sDAAsD,CAAC;AAErF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAMpF;;GAEG;AACH,wBAAsB,8BAA8B,CAAC,EACjD,OAAO,EACP,KAAK,GACR,EAAE;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,aAAa,CAAC;CACxB,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAwC1C;AAED;;GAEG;AACH,wBAAsB,6BAA6B,CAAC,EAChD,OAAO,EACP,UAAU,GACb,EAAE;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,kBAAkB,CAAC;CAClC,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module vcs-projection-helper
|
|
3
|
+
*
|
|
4
|
+
* CLI-specific filesystem projection helpers for reading and writing `.vcsgib/vcs_index_projection.json`.
|
|
5
|
+
* Strictly housed in `apps/vcs-gib` CLI layer to maintain pure isolation from `core-gib`.
|
|
6
|
+
*/
|
|
7
|
+
import path from 'node:path';
|
|
8
|
+
import fs from 'node:fs/promises';
|
|
9
|
+
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
10
|
+
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
11
|
+
import { getIbGibsFromCache_fallbackToSpaces } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
|
|
12
|
+
import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
|
|
13
|
+
const lcFile = `[vcs-projection-helper]`;
|
|
14
|
+
const logalot = GLOBAL_LOG_A_LOT;
|
|
15
|
+
/**
|
|
16
|
+
* Retrieves authoritative B2tFSIndexIbGib_V1 from space by reading the `.vcsgib/vcs_index_projection.json` pointer on disk.
|
|
17
|
+
*/
|
|
18
|
+
export async function readVcsIndexProjectionFromDisk({ vcsPath, space, }) {
|
|
19
|
+
const lc = `${lcFile}[${readVcsIndexProjectionFromDisk.name}]`;
|
|
20
|
+
try {
|
|
21
|
+
if (logalot) {
|
|
22
|
+
console.log(`${lc} starting... (I: 7e8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b)`);
|
|
23
|
+
}
|
|
24
|
+
if (!vcsPath) {
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
const projPath = path.join(vcsPath, 'vcs_index_projection.json');
|
|
28
|
+
let indexAddr;
|
|
29
|
+
try {
|
|
30
|
+
const raw = await fs.readFile(projPath, 'utf8');
|
|
31
|
+
const parsed = JSON.parse(raw);
|
|
32
|
+
indexAddr = parsed.indexAddr;
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
if (!indexAddr) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
const ibgibs = await getIbGibsFromCache_fallbackToSpaces({
|
|
41
|
+
addrs: [indexAddr],
|
|
42
|
+
space,
|
|
43
|
+
});
|
|
44
|
+
const indexIbGib = ibgibs?.at(0);
|
|
45
|
+
return indexIbGib;
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c)`);
|
|
49
|
+
throw error;
|
|
50
|
+
}
|
|
51
|
+
finally {
|
|
52
|
+
if (logalot) {
|
|
53
|
+
console.log(`${lc} complete. (I: 9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c4d)`);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Writes read-only JSON projection cache of repository index to disk.
|
|
59
|
+
*/
|
|
60
|
+
export async function writeVcsIndexProjectionToDisk({ vcsPath, indexIbGib, }) {
|
|
61
|
+
const lc = `${lcFile}[${writeVcsIndexProjectionToDisk.name}]`;
|
|
62
|
+
try {
|
|
63
|
+
if (logalot) {
|
|
64
|
+
console.log(`${lc} starting... (I: 3e4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b)`);
|
|
65
|
+
}
|
|
66
|
+
await fs.mkdir(vcsPath, { recursive: true });
|
|
67
|
+
const indexAddr = getIbGibAddr({ ibGib: indexIbGib });
|
|
68
|
+
const projectionObj = {
|
|
69
|
+
_isReadOnlyProjection: true,
|
|
70
|
+
_comment: 'STRICTLY READ-ONLY PROJECTION GENERATED FROM B2TFSINDEXIBGIB_V1 IN LOCALSPACE',
|
|
71
|
+
indexAddr,
|
|
72
|
+
spaceId: indexIbGib.data?.mySpaceId,
|
|
73
|
+
activeBranch: indexIbGib.data?.activeBranch || 'main',
|
|
74
|
+
stagedCount: (indexIbGib.data?.staged_item || []).length,
|
|
75
|
+
stagedPaths: indexIbGib.data?.stagedPaths || {},
|
|
76
|
+
updatedAt: new Date().toISOString(),
|
|
77
|
+
};
|
|
78
|
+
const projFile = path.join(vcsPath, 'vcs_index_projection.json');
|
|
79
|
+
await fs.writeFile(projFile, JSON.stringify(projectionObj, null, 2), 'utf8');
|
|
80
|
+
}
|
|
81
|
+
catch (error) {
|
|
82
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 4f5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c)`);
|
|
83
|
+
throw error;
|
|
84
|
+
}
|
|
85
|
+
finally {
|
|
86
|
+
if (logalot) {
|
|
87
|
+
console.log(`${lc} complete. (I: 5a6b7c8d9e0f1a2b3c4d5e6f7a8b9c0d)`);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=vcs-projection-helper.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"vcs-projection-helper.mjs","sourceRoot":"","sources":["../../src/cli/vcs-projection-helper.mts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
|
|
17
17
|
import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
|
|
18
18
|
import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
|
|
19
|
-
import { B2tFSBranchIbGib_V1 } from '
|
|
20
|
-
import { B2tFSItemIbGib_V1 } from '
|
|
19
|
+
import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/vcs/branch/branch-types.mjs';
|
|
20
|
+
import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/vcs/item/item-types.mjs';
|
|
21
21
|
/**
|
|
22
22
|
* Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
|
|
23
23
|
* b2tfs_item timeline as known by the given space.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-helpers.d.mts","sourceRoot":"","sources":["../../src/test/test-helpers.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,sDAAsD,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"test-helpers.d.mts","sourceRoot":"","sources":["../../src/test/test-helpers.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,sDAAsD,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,kDAAkD,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAgCjF;;;GAGG;AACH,wBAAsB,cAAc,CAAC,EACjC,KAAK,EACL,WAAW,EACX,KAAK,GACR,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,mBAAmB,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxD,KAAK,CAAC,EAAE,aAAa,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,KAAK,GACR,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAAC;IACpD,KAAK,CAAC,EAAE,aAAa,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiChB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAGjD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAExE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,IAAI,CAE5E"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibgib/vcs-gib",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.32",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.mjs",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"@ibgib/helper-gib": "^0.0.37",
|
|
23
23
|
"@ibgib/ts-gib": "^0.5.34",
|
|
24
24
|
"@ibgib/encrypt-gib": "^0.3.1",
|
|
25
|
-
"@ibgib/core-gib": "^0.1.
|
|
26
|
-
"@ibgib/node-gib": "^0.0.
|
|
25
|
+
"@ibgib/core-gib": "^0.1.78",
|
|
26
|
+
"@ibgib/node-gib": "^0.0.23"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -19,7 +19,7 @@ import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witn
|
|
|
19
19
|
import { fnCreateNewLocalSpace, fnDtoToSpace_nodeFilesystem } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace-helper.mjs';
|
|
20
20
|
|
|
21
21
|
import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
|
|
22
|
-
import { B2tFS3WayGraftStrategy } from '
|
|
22
|
+
import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/vcs/merge/b2tfs-3way-graft-strategy.mjs';
|
|
23
23
|
|
|
24
24
|
const lcFile = `[node-bootstrap]`;
|
|
25
25
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module cli-e2e.respec
|
|
3
|
-
*
|
|
3
|
+
*
|
|
4
4
|
* End-to-End CLI Integration Spec for @ibgib/vcs-gib.
|
|
5
5
|
* Executes full lifecycle: vcs init -> vcs status -> vcs add -> vcs commit -> vcs log -> vcs branch -> vcs checkout.
|
|
6
6
|
*/
|
|
@@ -21,7 +21,7 @@ import { executeLogCmd } from './commands/log-cmd.mjs';
|
|
|
21
21
|
import { executeBranchCmd } from './commands/branch-cmd.mjs';
|
|
22
22
|
import { executeCheckoutCmd } from './commands/checkout-cmd.mjs';
|
|
23
23
|
import { bootstrapVcsMetaspace } from '../bootstrap/node-bootstrap.mjs';
|
|
24
|
-
import {
|
|
24
|
+
import { readVcsIndexProjectionFromDisk } from './vcs-projection-helper.mjs';
|
|
25
25
|
|
|
26
26
|
const lc = `[apps/vcs-gib/src/cli/cli-e2e.respec.node.mts]`;
|
|
27
27
|
|
|
@@ -111,7 +111,7 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
|
|
|
111
111
|
repoPath: testDir,
|
|
112
112
|
vcsFolderName,
|
|
113
113
|
});
|
|
114
|
-
const e2eIndexAdd = await
|
|
114
|
+
const e2eIndexAdd = await readVcsIndexProjectionFromDisk({ space: e2eSpaceAdd, vcsPath: e2eVcsPathAdd });
|
|
115
115
|
iReckon(lc, Boolean(e2eIndexAdd?.data?.staged_item && e2eIndexAdd.data.staged_item.length >= 2)).isGonnaBeTrue();
|
|
116
116
|
iReckon(lc, e2eIndexAdd?.rel8ns?.staged_item).isGonnaBeFalsy();
|
|
117
117
|
|
|
@@ -134,7 +134,7 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
|
|
|
134
134
|
repoPath: testDir,
|
|
135
135
|
vcsFolderName,
|
|
136
136
|
});
|
|
137
|
-
const e2eIndexCommit = await
|
|
137
|
+
const e2eIndexCommit = await readVcsIndexProjectionFromDisk({ space: e2eSpaceCommit, vcsPath: e2eVcsPathCommit });
|
|
138
138
|
iReckon(lc, e2eIndexCommit?.data?.staged_item).willEqual([]);
|
|
139
139
|
iReckon(lc, e2eIndexCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
|
|
140
140
|
|