@ibgib/vcs-gib 0.0.21 → 0.0.26
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/CHANGELOG.md +19 -0
- package/VCS_CLI_USER_GUIDE.md +94 -89
- 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/cli/cli-arg-parser.d.mts +1 -0
- package/dist/cli/cli-arg-parser.d.mts.map +1 -1
- package/dist/cli/cli-arg-parser.mjs +5 -1
- package/dist/cli/cli-arg-parser.mjs.map +1 -1
- package/dist/cli/cli-constants.d.mts +6 -0
- package/dist/cli/cli-constants.d.mts.map +1 -1
- package/dist/cli/cli-constants.mjs +12 -0
- package/dist/cli/cli-constants.mjs.map +1 -1
- package/dist/cli/commands/add-cmd.d.mts.map +1 -1
- package/dist/cli/commands/add-cmd.mjs +5 -2
- package/dist/cli/commands/add-cmd.mjs.map +1 -1
- package/dist/cli/commands/commit-cmd.d.mts +5 -4
- package/dist/cli/commands/commit-cmd.d.mts.map +1 -1
- package/dist/cli/commands/commit-cmd.mjs +149 -33
- package/dist/cli/commands/commit-cmd.mjs.map +1 -1
- package/dist/cli/commands/generate-comment-cmd.d.mts +19 -0
- package/dist/cli/commands/generate-comment-cmd.d.mts.map +1 -0
- package/dist/cli/commands/generate-comment-cmd.mjs +140 -0
- package/dist/cli/commands/generate-comment-cmd.mjs.map +1 -0
- package/dist/cli/commands/log-cmd.d.mts +12 -3
- package/dist/cli/commands/log-cmd.d.mts.map +1 -1
- package/dist/cli/commands/log-cmd.mjs +236 -38
- package/dist/cli/commands/log-cmd.mjs.map +1 -1
- package/dist/cli/commands/merge-cmd.d.mts +21 -8
- package/dist/cli/commands/merge-cmd.d.mts.map +1 -1
- package/dist/cli/commands/merge-cmd.mjs +138 -70
- package/dist/cli/commands/merge-cmd.mjs.map +1 -1
- package/dist/cli/commands/status-cmd.d.mts +5 -6
- package/dist/cli/commands/status-cmd.d.mts.map +1 -1
- package/dist/cli/commands/status-cmd.mjs +50 -205
- package/dist/cli/commands/status-cmd.mjs.map +1 -1
- package/dist/cli/vcs-cli-main.d.mts.map +1 -1
- package/dist/cli/vcs-cli-main.mjs +27 -6
- package/dist/cli/vcs-cli-main.mjs.map +1 -1
- package/dist/engine/index/index-helper.d.mts.map +1 -1
- package/dist/engine/index/index-helper.mjs +3 -0
- package/dist/engine/index/index-helper.mjs.map +1 -1
- package/dist/engine/item/item-helper.d.mts +31 -1
- package/dist/engine/item/item-helper.d.mts.map +1 -1
- package/dist/engine/item/item-helper.mjs +44 -2
- package/dist/engine/item/item-helper.mjs.map +1 -1
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts +74 -0
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts.map +1 -0
- package/dist/engine/merge/{b2tfs-3way-merge-strategy.mjs → b2tfs-3way-graft-strategy.mjs} +133 -304
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map +1 -0
- package/dist/engine/merge/{b2tfs-3way-merge-types.d.mts → b2tfs-3way-graft-types.d.mts} +2 -9
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map +1 -0
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs +2 -0
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map +1 -0
- package/dist/engine/status/status-helper.d.mts +89 -0
- package/dist/engine/status/status-helper.d.mts.map +1 -0
- package/dist/engine/status/status-helper.mjs +285 -0
- package/dist/engine/status/status-helper.mjs.map +1 -0
- package/dist/test/test-helpers.d.mts +51 -0
- package/dist/test/test-helpers.d.mts.map +1 -0
- package/dist/test/test-helpers.mjs +135 -0
- package/dist/test/test-helpers.mjs.map +1 -0
- package/package.json +4 -4
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +1 -1
- package/src/cli/cli-arg-parser.mts +5 -0
- package/src/cli/cli-constants.mts +13 -0
- package/src/cli/commands/add-cmd.mts +5 -2
- package/src/cli/commands/branch-checkout-cmd.respec.log +8 -101
- package/src/cli/commands/branch-checkout-cmd.respec.mts +11 -10
- package/src/cli/commands/commit-cmd.mts +165 -42
- package/src/cli/commands/commit-log-cmd.respec.mts +216 -3
- package/src/cli/commands/generate-comment-cmd.mts +171 -0
- package/src/cli/commands/log-cmd.mts +288 -41
- package/src/cli/commands/merge-cmd.mts +154 -76
- package/src/cli/commands/status-cmd.mts +57 -256
- package/src/cli/vcs-cli-main.mts +28 -7
- package/src/engine/index/index-helper.mts +3 -0
- package/src/engine/item/item-helper.mts +76 -3
- package/src/engine/merge/{b2tfs-3way-merge-strategy.mts → b2tfs-3way-graft-strategy.mts} +152 -374
- package/src/engine/merge/{b2tfs-3way-merge-strategy.respec.mts → b2tfs-3way-graft-strategy.respec.mts} +27 -122
- package/src/engine/merge/{b2tfs-3way-merge-types.mts → b2tfs-3way-graft-types.mts} +34 -42
- package/src/engine/merge/b2tfs-sync-comments.respec.mts +399 -0
- package/src/engine/status/status-helper.mts +380 -0
- package/src/test/test-helpers.mts +168 -0
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/engine/merge/b2tfs-3way-merge-strategy.d.mts +0 -48
- package/dist/engine/merge/b2tfs-3way-merge-strategy.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-strategy.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-types.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-types.mjs +0 -2
- package/dist/engine/merge/b2tfs-3way-merge-types.mjs.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-strategy.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-strategy.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,7 @@
|
|
|
1
1
|
import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
|
|
2
2
|
import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
|
|
3
3
|
/**
|
|
4
|
-
* Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs
|
|
5
|
-
*
|
|
6
|
-
* ## note on "Details"
|
|
7
|
-
*
|
|
8
|
-
* stupid word "details" is plural and I have this set to be an
|
|
9
|
-
* array. don't have the ability to refactor right now, so this will
|
|
10
|
-
* be mildly confusing unfortunately. Agents should not try to just
|
|
11
|
-
* refactor this on the fly.
|
|
4
|
+
* Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs.
|
|
12
5
|
*/
|
|
13
6
|
export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
|
|
14
7
|
/**
|
|
@@ -38,4 +31,4 @@ export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
|
|
|
38
31
|
*/
|
|
39
32
|
orphanTextBinAddr: IbGibAddr | undefined;
|
|
40
33
|
}
|
|
41
|
-
//# sourceMappingURL=b2tfs-3way-
|
|
34
|
+
//# sourceMappingURL=b2tfs-3way-graft-types.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-types.d.mts","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D;;;;;OAKG;IACH,qBAAqB,EAAE,SAAS,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,uBAAuB,EAAE,SAAS,CAAC;IACnC;;;;OAIG;IACH,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-types.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module status-helper
|
|
3
|
+
*
|
|
4
|
+
* Pure status inspection helpers and pending `.ib.*.md` comment metadata detection.
|
|
5
|
+
*/
|
|
6
|
+
import { B2tFSItemIbGib_V1 } from '../item/item-types.mjs';
|
|
7
|
+
export interface VcsStatusItem {
|
|
8
|
+
path: string;
|
|
9
|
+
fsType: 'file' | 'folder';
|
|
10
|
+
status: 'untracked' | 'modified' | 'deleted' | 'staged';
|
|
11
|
+
}
|
|
12
|
+
export interface PendingCommentInfo {
|
|
13
|
+
/** Relative path of the companion file, e.g. "src/.ib.index.mts.md" or ".ib.architecture.md" */
|
|
14
|
+
commentRelPath: string;
|
|
15
|
+
/** Full disk path of the companion file */
|
|
16
|
+
commentFullPath: string;
|
|
17
|
+
/** Target relative path this comment attaches to, e.g. "src/index.mts" or "src" (folder) or "" (root) */
|
|
18
|
+
targetRelPath: string;
|
|
19
|
+
/** 'file' if .ib.<filename>.md matches a file, or 'folder' */
|
|
20
|
+
targetType: 'file' | 'folder';
|
|
21
|
+
/** The topic name (the * in .ib.*.md) or filename */
|
|
22
|
+
topicName: string;
|
|
23
|
+
/** Raw text content of the markdown comment file */
|
|
24
|
+
content: string;
|
|
25
|
+
}
|
|
26
|
+
export interface RepoStatusResult {
|
|
27
|
+
branchName: string;
|
|
28
|
+
activeWorktreeDir: string;
|
|
29
|
+
staged: VcsStatusItem[];
|
|
30
|
+
modified: VcsStatusItem[];
|
|
31
|
+
deleted: VcsStatusItem[];
|
|
32
|
+
untracked: VcsStatusItem[];
|
|
33
|
+
pendingComments: PendingCommentInfo[];
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Returns true if filename is a `.ib.*.md` comment metadata file.
|
|
37
|
+
*/
|
|
38
|
+
export declare function isCommentMetadataFilename(filename: string): boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Extracts the inner topic / filename from `.ib.<topic>.md`.
|
|
41
|
+
*/
|
|
42
|
+
export declare function extractCommentTopicName(filename: string): string;
|
|
43
|
+
/**
|
|
44
|
+
* Pure helper to walk the branch graph items.
|
|
45
|
+
*/
|
|
46
|
+
export declare function walkBranchGraph({ item, space, metaspace, currentRelPath, outMap, }: {
|
|
47
|
+
item: B2tFSItemIbGib_V1;
|
|
48
|
+
space: any;
|
|
49
|
+
metaspace?: any;
|
|
50
|
+
currentRelPath: string;
|
|
51
|
+
outMap: Map<string, {
|
|
52
|
+
relPath: string;
|
|
53
|
+
fileHash?: string;
|
|
54
|
+
fsType: 'file' | 'folder';
|
|
55
|
+
}>;
|
|
56
|
+
}): Promise<void>;
|
|
57
|
+
/**
|
|
58
|
+
* Pure helper to scan physical workspace, separating source files from `.ib.*.md` comment files.
|
|
59
|
+
*/
|
|
60
|
+
export declare function scanPhysicalWorkspace({ dirPath, baseDir, vcsFolderName, filterPatterns, outSourceMap, outCommentFiles, }: {
|
|
61
|
+
dirPath: string;
|
|
62
|
+
baseDir: string;
|
|
63
|
+
vcsFolderName: string;
|
|
64
|
+
filterPatterns: string[];
|
|
65
|
+
outSourceMap: Map<string, {
|
|
66
|
+
relPath: string;
|
|
67
|
+
fullPath: string;
|
|
68
|
+
isDirectory: boolean;
|
|
69
|
+
fileHash?: string;
|
|
70
|
+
}>;
|
|
71
|
+
outCommentFiles: Array<{
|
|
72
|
+
relPath: string;
|
|
73
|
+
fullPath: string;
|
|
74
|
+
parentRelPath: string;
|
|
75
|
+
filename: string;
|
|
76
|
+
}>;
|
|
77
|
+
}): Promise<void>;
|
|
78
|
+
/**
|
|
79
|
+
* Computes complete repository status, including staged, modified, deleted, untracked,
|
|
80
|
+
* and mapped pending `.ib.*.md` comment files.
|
|
81
|
+
*/
|
|
82
|
+
export declare function getRepoStatus({ metaspace, localSpace, vcsPath, repoRoot, vcsFolderName, }: {
|
|
83
|
+
metaspace: any;
|
|
84
|
+
localSpace: any;
|
|
85
|
+
vcsPath: string;
|
|
86
|
+
repoRoot: string;
|
|
87
|
+
vcsFolderName?: string;
|
|
88
|
+
}): Promise<RepoStatusResult>;
|
|
89
|
+
//# sourceMappingURL=status-helper.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-helper.d.mts","sourceRoot":"","sources":["../../../src/engine/status/status-helper.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,EAAE,iBAAiB,EAA+B,MAAM,wBAAwB,CAAC;AAQxF,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC1B,MAAM,EAAE,WAAW,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;CAC3D;AAED,MAAM,WAAW,kBAAkB;IAC/B,gGAAgG;IAChG,cAAc,EAAE,MAAM,CAAC;IACvB,2CAA2C;IAC3C,eAAe,EAAE,MAAM,CAAC;IACxB,yGAAyG;IACzG,aAAa,EAAE,MAAM,CAAC;IACtB,8DAA8D;IAC9D,UAAU,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC9B,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,oDAAoD;IACpD,OAAO,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,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;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEnE;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGhE;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,EAClC,IAAI,EACJ,KAAK,EACL,SAAS,EACT,cAAc,EACd,MAAM,GACT,EAAE;IACC,IAAI,EAAE,iBAAiB,CAAC;IACxB,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,GAAG,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAC,CAAC;CAC1F,GAAG,OAAO,CAAC,IAAI,CAAC,CA8BhB;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,EACxC,OAAO,EACP,OAAO,EACP,aAAa,EACb,cAAc,EACd,YAAY,EACZ,eAAe,GAClB,EAAE;IACC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC1G,eAAe,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1G,GAAG,OAAO,CAAC,IAAI,CAAC,CAwDhB;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,EAChC,SAAS,EACT,UAAU,EACV,OAAO,EACP,QAAQ,EACR,aAAyB,GAC5B,EAAE;IACC,SAAS,EAAE,GAAG,CAAC;IACf,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAgL5B"}
|
|
@@ -0,0 +1,285 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module status-helper
|
|
3
|
+
*
|
|
4
|
+
* Pure status inspection helpers and pending `.ib.*.md` comment metadata detection.
|
|
5
|
+
*/
|
|
6
|
+
import path from 'node:path';
|
|
7
|
+
import fs from 'node:fs/promises';
|
|
8
|
+
import crypto from 'node:crypto';
|
|
9
|
+
import { B2TFS_CHILD_ITEM_REL8N_NAME } from '../item/item-types.mjs';
|
|
10
|
+
import { getIbGibWithMetaspaceFallback } from '../item/item-helper.mjs';
|
|
11
|
+
import { isPathFiltered, parseFilterFileContent } from '../filter/glob-helper.mjs';
|
|
12
|
+
import { getB2tFSIndexIbGib } from '../index/index-helper.mjs';
|
|
13
|
+
import { getOrCreateBranchSpace } from '../branch/branch-space-helper.mjs';
|
|
14
|
+
/**
|
|
15
|
+
* Returns true if filename is a `.ib.*.md` comment metadata file.
|
|
16
|
+
*/
|
|
17
|
+
export function isCommentMetadataFilename(filename) {
|
|
18
|
+
return filename.startsWith('.ib.') && filename.endsWith('.md') && filename.length > '.ib..md'.length;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Extracts the inner topic / filename from `.ib.<topic>.md`.
|
|
22
|
+
*/
|
|
23
|
+
export function extractCommentTopicName(filename) {
|
|
24
|
+
if (!isCommentMetadataFilename(filename)) {
|
|
25
|
+
return '';
|
|
26
|
+
}
|
|
27
|
+
return filename.slice(4, -3); // strips leading '.ib.' and trailing '.md'
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Pure helper to walk the branch graph items.
|
|
31
|
+
*/
|
|
32
|
+
export async function walkBranchGraph({ item, space, metaspace, currentRelPath, outMap, }) {
|
|
33
|
+
if (!item || !item.data) {
|
|
34
|
+
return;
|
|
35
|
+
}
|
|
36
|
+
const { fsType, fileHash } = item.data;
|
|
37
|
+
if (currentRelPath) {
|
|
38
|
+
outMap.set(currentRelPath, { relPath: currentRelPath, fileHash, fsType });
|
|
39
|
+
}
|
|
40
|
+
if (fsType === 'folder') {
|
|
41
|
+
const childAddrs = item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
|
|
42
|
+
for (const childAddr of childAddrs) {
|
|
43
|
+
const childItem = await getIbGibWithMetaspaceFallback({
|
|
44
|
+
addr: childAddr,
|
|
45
|
+
space,
|
|
46
|
+
metaspace,
|
|
47
|
+
});
|
|
48
|
+
if (childItem && childItem.data) {
|
|
49
|
+
const childRelPath = currentRelPath
|
|
50
|
+
? `${currentRelPath}/${childItem.data.name}`
|
|
51
|
+
: childItem.data.name;
|
|
52
|
+
await walkBranchGraph({
|
|
53
|
+
item: childItem,
|
|
54
|
+
space,
|
|
55
|
+
metaspace,
|
|
56
|
+
currentRelPath: childRelPath,
|
|
57
|
+
outMap,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Pure helper to scan physical workspace, separating source files from `.ib.*.md` comment files.
|
|
65
|
+
*/
|
|
66
|
+
export async function scanPhysicalWorkspace({ dirPath, baseDir, vcsFolderName, filterPatterns, outSourceMap, outCommentFiles, }) {
|
|
67
|
+
let entries = [];
|
|
68
|
+
try {
|
|
69
|
+
entries = await fs.readdir(dirPath, { withFileTypes: true });
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return;
|
|
73
|
+
}
|
|
74
|
+
for (const entry of entries) {
|
|
75
|
+
const fullEntryPath = path.join(dirPath, entry.name);
|
|
76
|
+
const relPath = path.relative(baseDir, fullEntryPath).replace(/\\/g, '/');
|
|
77
|
+
// Ignore vcs storage folder, .git, and worktrees folder b
|
|
78
|
+
if (relPath === vcsFolderName || relPath.startsWith(vcsFolderName + '/') ||
|
|
79
|
+
relPath === '.git' || relPath.startsWith('.git/') ||
|
|
80
|
+
relPath === 'b' || relPath.startsWith('b/')) {
|
|
81
|
+
continue;
|
|
82
|
+
}
|
|
83
|
+
if (isPathFiltered({ relativePath: relPath, isDirectory: entry.isDirectory(), filterPatterns })) {
|
|
84
|
+
continue;
|
|
85
|
+
}
|
|
86
|
+
if (entry.isDirectory()) {
|
|
87
|
+
outSourceMap.set(relPath, { relPath, fullPath: fullEntryPath, isDirectory: true });
|
|
88
|
+
await scanPhysicalWorkspace({
|
|
89
|
+
dirPath: fullEntryPath,
|
|
90
|
+
baseDir,
|
|
91
|
+
vcsFolderName,
|
|
92
|
+
filterPatterns,
|
|
93
|
+
outSourceMap,
|
|
94
|
+
outCommentFiles,
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
else if (entry.isFile()) {
|
|
98
|
+
if (isCommentMetadataFilename(entry.name)) {
|
|
99
|
+
const parentRelPath = path.relative(baseDir, dirPath).replace(/\\/g, '/');
|
|
100
|
+
outCommentFiles.push({
|
|
101
|
+
relPath,
|
|
102
|
+
fullPath: fullEntryPath,
|
|
103
|
+
parentRelPath: parentRelPath === '.' ? '' : parentRelPath,
|
|
104
|
+
filename: entry.name,
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
let fileHash;
|
|
109
|
+
try {
|
|
110
|
+
const fileData = await fs.readFile(fullEntryPath);
|
|
111
|
+
fileHash = crypto.createHash('sha256').update(fileData).digest('hex');
|
|
112
|
+
}
|
|
113
|
+
catch {
|
|
114
|
+
// File unreadable
|
|
115
|
+
}
|
|
116
|
+
outSourceMap.set(relPath, { relPath, fullPath: fullEntryPath, isDirectory: false, fileHash });
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
* Computes complete repository status, including staged, modified, deleted, untracked,
|
|
123
|
+
* and mapped pending `.ib.*.md` comment files.
|
|
124
|
+
*/
|
|
125
|
+
export async function getRepoStatus({ metaspace, localSpace, vcsPath, repoRoot, vcsFolderName = '.vcsgib', }) {
|
|
126
|
+
const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
|
|
127
|
+
const branchName = indexIbGib?.data?.activeBranch || 'main';
|
|
128
|
+
const activeWorktreeDir = branchName === 'main' ? repoRoot : path.join(repoRoot, 'b', branchName);
|
|
129
|
+
const { space: activeBranchSpace } = await getOrCreateBranchSpace({
|
|
130
|
+
metaspace,
|
|
131
|
+
vcsPath,
|
|
132
|
+
branchName,
|
|
133
|
+
});
|
|
134
|
+
const stagedMap = new Map();
|
|
135
|
+
const indexStagedPaths = indexIbGib?.data?.stagedPaths || {};
|
|
136
|
+
for (const [relPath, itemRec] of Object.entries(indexStagedPaths)) {
|
|
137
|
+
stagedMap.set(relPath, itemRec);
|
|
138
|
+
}
|
|
139
|
+
let rootItemAddr;
|
|
140
|
+
const branchAddrs = [
|
|
141
|
+
...(indexIbGib?.rel8ns?.branch || []),
|
|
142
|
+
...(indexIbGib?.rel8ns?.branch_tjp || []),
|
|
143
|
+
];
|
|
144
|
+
if (branchAddrs.length > 0) {
|
|
145
|
+
let branchIbGibs = [];
|
|
146
|
+
for (const bAddr of branchAddrs) {
|
|
147
|
+
const bIbGib = await getIbGibWithMetaspaceFallback({
|
|
148
|
+
addr: bAddr,
|
|
149
|
+
space: activeBranchSpace,
|
|
150
|
+
metaspace,
|
|
151
|
+
});
|
|
152
|
+
if (bIbGib) {
|
|
153
|
+
branchIbGibs.push(bIbGib);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
const activeBranchIbGib = branchIbGibs.find((b) => b?.data?.name === branchName) || branchIbGibs.at(0);
|
|
157
|
+
rootItemAddr = activeBranchIbGib?.rel8ns?.b2tFS_item?.at(0) || activeBranchIbGib?.rel8ns?.b2tfs_item?.at(0);
|
|
158
|
+
}
|
|
159
|
+
let filterPatterns = [];
|
|
160
|
+
const ignorePath = path.join(activeWorktreeDir, '.ibgibignore');
|
|
161
|
+
try {
|
|
162
|
+
const ignoreContent = await fs.readFile(ignorePath, 'utf8');
|
|
163
|
+
filterPatterns = parseFilterFileContent(ignoreContent);
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
// Ignore file missing is fine
|
|
167
|
+
}
|
|
168
|
+
const branchItemsMap = new Map();
|
|
169
|
+
if (rootItemAddr) {
|
|
170
|
+
const rootItem = await getIbGibWithMetaspaceFallback({
|
|
171
|
+
addr: rootItemAddr,
|
|
172
|
+
space: activeBranchSpace,
|
|
173
|
+
metaspace,
|
|
174
|
+
});
|
|
175
|
+
if (rootItem) {
|
|
176
|
+
await walkBranchGraph({
|
|
177
|
+
item: rootItem,
|
|
178
|
+
space: activeBranchSpace,
|
|
179
|
+
metaspace,
|
|
180
|
+
currentRelPath: '',
|
|
181
|
+
outMap: branchItemsMap,
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
const physicalItemsMap = new Map();
|
|
186
|
+
const rawCommentFiles = [];
|
|
187
|
+
await scanPhysicalWorkspace({
|
|
188
|
+
dirPath: activeWorktreeDir,
|
|
189
|
+
baseDir: activeWorktreeDir,
|
|
190
|
+
vcsFolderName,
|
|
191
|
+
filterPatterns,
|
|
192
|
+
outSourceMap: physicalItemsMap,
|
|
193
|
+
outCommentFiles: rawCommentFiles,
|
|
194
|
+
});
|
|
195
|
+
const staged = [];
|
|
196
|
+
const modified = [];
|
|
197
|
+
const deleted = [];
|
|
198
|
+
const untracked = [];
|
|
199
|
+
for (const [relPath, stagedRec] of stagedMap.entries()) {
|
|
200
|
+
staged.push({
|
|
201
|
+
path: relPath,
|
|
202
|
+
fsType: stagedRec.fsType || 'file',
|
|
203
|
+
status: 'staged',
|
|
204
|
+
});
|
|
205
|
+
}
|
|
206
|
+
for (const [relPath, physItem] of physicalItemsMap.entries()) {
|
|
207
|
+
if (stagedMap.has(relPath)) {
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
210
|
+
const branchItem = branchItemsMap.get(relPath);
|
|
211
|
+
if (!branchItem) {
|
|
212
|
+
untracked.push({
|
|
213
|
+
path: relPath,
|
|
214
|
+
fsType: physItem.isDirectory ? 'folder' : 'file',
|
|
215
|
+
status: 'untracked',
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
if (!physItem.isDirectory && physItem.fileHash && branchItem.fileHash && physItem.fileHash !== branchItem.fileHash) {
|
|
220
|
+
modified.push({
|
|
221
|
+
path: relPath,
|
|
222
|
+
fsType: 'file',
|
|
223
|
+
status: 'modified',
|
|
224
|
+
});
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
for (const [relPath, branchItem] of branchItemsMap.entries()) {
|
|
229
|
+
if (!relPath || relPath === '.' || relPath === '') {
|
|
230
|
+
continue;
|
|
231
|
+
}
|
|
232
|
+
if (!physicalItemsMap.has(relPath) && !stagedMap.has(relPath)) {
|
|
233
|
+
deleted.push({
|
|
234
|
+
path: relPath,
|
|
235
|
+
fsType: branchItem.fsType,
|
|
236
|
+
status: 'deleted',
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
// Map raw comment files to targets (file or folder)
|
|
241
|
+
const pendingComments = [];
|
|
242
|
+
for (const raw of rawCommentFiles) {
|
|
243
|
+
const topicName = extractCommentTopicName(raw.filename);
|
|
244
|
+
const candidateFileRelPath = raw.parentRelPath ? `${raw.parentRelPath}/${topicName}` : topicName;
|
|
245
|
+
let targetType = 'folder';
|
|
246
|
+
let targetRelPath = raw.parentRelPath;
|
|
247
|
+
if (physicalItemsMap.has(candidateFileRelPath) && !physicalItemsMap.get(candidateFileRelPath)?.isDirectory) {
|
|
248
|
+
targetType = 'file';
|
|
249
|
+
targetRelPath = candidateFileRelPath;
|
|
250
|
+
}
|
|
251
|
+
else if (branchItemsMap.has(candidateFileRelPath) && branchItemsMap.get(candidateFileRelPath)?.fsType === 'file') {
|
|
252
|
+
targetType = 'file';
|
|
253
|
+
targetRelPath = candidateFileRelPath;
|
|
254
|
+
}
|
|
255
|
+
else if (stagedMap.has(candidateFileRelPath)) {
|
|
256
|
+
targetType = 'file';
|
|
257
|
+
targetRelPath = candidateFileRelPath;
|
|
258
|
+
}
|
|
259
|
+
let content = '';
|
|
260
|
+
try {
|
|
261
|
+
content = await fs.readFile(raw.fullPath, 'utf8');
|
|
262
|
+
}
|
|
263
|
+
catch {
|
|
264
|
+
// Unreadable comment file
|
|
265
|
+
}
|
|
266
|
+
pendingComments.push({
|
|
267
|
+
commentRelPath: raw.relPath,
|
|
268
|
+
commentFullPath: raw.fullPath,
|
|
269
|
+
targetRelPath,
|
|
270
|
+
targetType,
|
|
271
|
+
topicName,
|
|
272
|
+
content,
|
|
273
|
+
});
|
|
274
|
+
}
|
|
275
|
+
return {
|
|
276
|
+
branchName,
|
|
277
|
+
activeWorktreeDir,
|
|
278
|
+
staged,
|
|
279
|
+
modified,
|
|
280
|
+
deleted,
|
|
281
|
+
untracked,
|
|
282
|
+
pendingComments,
|
|
283
|
+
};
|
|
284
|
+
}
|
|
285
|
+
//# sourceMappingURL=status-helper.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-helper.mjs","sourceRoot":"","sources":["../../../src/engine/status/status-helper.mts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module test-helpers
|
|
3
|
+
*
|
|
4
|
+
* Pure-function diagnostic helpers for logging and inspecting b2tfs ibgib
|
|
5
|
+
* state during tests. These are NOT production code — they are imported only
|
|
6
|
+
* by test files (*.respec.mts) and the handful of vcs-gib commands that
|
|
7
|
+
* temporarily wire in diagnostic logging.
|
|
8
|
+
*
|
|
9
|
+
* Usage pattern:
|
|
10
|
+
*
|
|
11
|
+
* ```ts
|
|
12
|
+
* import { logBranchState, logItemState } from '../../test/test-helpers.mjs';
|
|
13
|
+
* await logBranchState({ label: 'after commit', branchIbGib, space });
|
|
14
|
+
* ```
|
|
15
|
+
*/
|
|
16
|
+
import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
|
|
17
|
+
import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
|
|
18
|
+
import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
|
|
19
|
+
import { B2tFSBranchIbGib_V1 } from '../engine/branch/branch-types.mjs';
|
|
20
|
+
import { B2tFSItemIbGib_V1 } from '../engine/item/item-types.mjs';
|
|
21
|
+
/**
|
|
22
|
+
* Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
|
|
23
|
+
* b2tfs_item timeline as known by the given space.
|
|
24
|
+
*/
|
|
25
|
+
export declare function logBranchState({ label, branchIbGib, space, }: {
|
|
26
|
+
label: string;
|
|
27
|
+
branchIbGib: B2tFSBranchIbGib_V1 | IbGib_V1 | undefined;
|
|
28
|
+
space?: IbGibSpaceAny;
|
|
29
|
+
}): Promise<void>;
|
|
30
|
+
/**
|
|
31
|
+
* Logs a compact snapshot of a b2tfs item ibgib and optionally the latest addr
|
|
32
|
+
* for its timeline as known by the given space.
|
|
33
|
+
*/
|
|
34
|
+
export declare function logItemState({ label, itemIbGib, space, }: {
|
|
35
|
+
label: string;
|
|
36
|
+
itemIbGib: B2tFSItemIbGib_V1 | IbGib_V1 | undefined;
|
|
37
|
+
space?: IbGibSpaceAny;
|
|
38
|
+
}): Promise<void>;
|
|
39
|
+
/**
|
|
40
|
+
* Logs a one-line separator to make log sections visually scannable.
|
|
41
|
+
*/
|
|
42
|
+
export declare function logCheckpoint(label: string): void;
|
|
43
|
+
/**
|
|
44
|
+
* Logs the full addr (no shortening) for debugging addr comparison issues.
|
|
45
|
+
*/
|
|
46
|
+
export declare function logAddr(label: string, addr: IbGibAddr | undefined): void;
|
|
47
|
+
/**
|
|
48
|
+
* Logs a set of addrs with short formatting.
|
|
49
|
+
*/
|
|
50
|
+
export declare function logAddrs(label: string, addrs: IbGibAddr[] | undefined): void;
|
|
51
|
+
//# sourceMappingURL=test-helpers.d.mts.map
|
|
@@ -0,0 +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,mCAAmC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAgClE;;;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"}
|