@ibgib/vcs-gib 0.0.21 → 0.0.26

package/src/engine/merge/{b2tfs-3way-merge-strategy.respec.mts → b2tfs-3way-graft-strategy.respec.mts}

@@ -1,11 +1,11 @@
 /**
- * @module b2tfs-merge-strategy.respec.node
+ * @module b2tfs-3way-graft-strategy.respec.node
  *
- * In-memory respec unit tests for B2tFSItem3WayMergeStrategy.
+ * In-memory respec unit tests for B2tFS3WayGraftStrategy.
  */
 
 import {
-    respecfully, ifWe, ifWeMight, iReckon,
+    respecfully, ifWe, iReckon,
     firstOfEach
 } from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
 
@@ -22,10 +22,10 @@ import { BinIbGib_V1 } from '@ibgib/core-gib/dist/common/bin/bin-types.mjs';
 import { GraftStrategyService } from '@ibgib/core-gib/dist/sync/graft-info/graft-strategy-service.mjs';
 
 import { createB2tFSItemIbGib, evolveB2tFSItemIbGib } from '../item/item-helper.mjs';
-import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME, B2TFS_CHILD_ITEM_REL8N_NAME } from '../item/item-types.mjs';
-import { B2tFS3WayGraftStrategy, B2tFSItem3WayMergeStrategy } from './b2tfs-3way-merge-strategy.mjs';
+import { B2tFSItemIbGib_V1, BINARY_REL8N_NAME } from '../item/item-types.mjs';
+import { B2tFS3WayGraftStrategy } from './b2tfs-3way-graft-strategy.mjs';
 
-const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-merge-strategy.respec.node.mts]`;
+const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-3way-graft-strategy.respec.node.mts]`;
 
 const graftStrategySvc = GraftStrategyService.instance;
 
@@ -132,59 +132,11 @@ async function evolveFileContent({
     return evolveRes.newIbGib as B2tFSItemIbGib_V1;
 }
 
-async function createFolderItem({
-    name,
-    childAddrs,
-    space,
-}: {
-    name: string;
-    childAddrs: string[];
-    space: any;
-}): Promise<B2tFSItemIbGib_V1> {
-    const res = await createB2tFSItemIbGib({
-        fsType: 'folder',
-        name,
-        rel8ns: {
-            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
-        },
-    });
-
-    await persistTransformResult({ resTransform: res, space });
-    await registerNewIbGib({ ibGib: res.newIbGib, space });
-
-    return res.newIbGib as B2tFSItemIbGib_V1;
-}
-
-async function evolveFolderItem({
-    existingItem,
-    childAddrs,
-    space,
-}: {
-    existingItem: B2tFSItemIbGib_V1;
-    childAddrs: string[];
-    space: any;
-}): Promise<B2tFSItemIbGib_V1> {
-    const res = await evolveB2tFSItemIbGib({
-        existingItem,
-        rel8nsToUpdate: {
-            [B2TFS_CHILD_ITEM_REL8N_NAME]: childAddrs,
-        },
-        rel8nsToRemove: {
-            [B2TFS_CHILD_ITEM_REL8N_NAME]: existingItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [],
-        },
-    });
-
-    await persistTransformResult({ resTransform: res, space });
-    await registerNewIbGib({ ibGib: res.newIbGib, space });
-
-    return res.newIbGib as B2tFSItemIbGib_V1;
-}
-
-await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () => {
+await respecfully(lc, `B2tFS3WayGraftStrategy In-Memory Respecs`, async () => {
 
     firstOfEach(lc, async () => {
         graftStrategySvc.reset();
-        graftStrategySvc.registerStrategy(new B2tFSItem3WayMergeStrategy());
+        graftStrategySvc.registerStrategy(new B2tFS3WayGraftStrategy());
     });
 
     await ifWe(lc, `performs non-conflicting line merges across two branch timelines`, async () => {
@@ -199,30 +151,23 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         const lcaFile = await createFileWithContent({ name: 'app.ts', content: initialText, space });
         const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
 
-        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
-        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
-
         // Base branch modifies line 1
         const baseText = "line 1 modified by base\nline 2\nline 3";
         const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
         const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
-        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
 
         // Orphan branch modifies line 3
         const orphanText = "line 1\nline 2\nline 3 modified by orphan";
         const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
         const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
-        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
 
-        const timelineA = [lcaFolderAddr, baseFolderAddr];
-        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const timelineA = [lcaAddr, baseFileAddr];
+        const timelineB = [lcaAddr, orphanFileAddr];
 
         const graftResult = await graftStrategySvc.graftTimelines({
             timelineAddrsA: timelineA,
             timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaFolderAddr,
+            latestCommonFrameAddr: lcaAddr,
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
             ibGibReadCache: {},
             space,
@@ -231,13 +176,7 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
 
         const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
-        const mergedFolder = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
-
-        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
-        iReckon(lc, mergedChildAddr).isGonnaBeTruthy();
-
-        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr!] });
-        const mergedFile = fileGet.ibGibs![0] as B2tFSItemIbGib_V1;
+        const mergedFile = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
 
         const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
         iReckon(lc, binAddr).isGonnaBeTruthy();
@@ -263,41 +202,30 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         const lcaFile = await createFileWithContent({ name: 'index.ts', content: initialText, space });
         const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
 
-        const lcaFolder = await createFolderItem({ name: 'src', childAddrs: [lcaAddr], space });
-        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
-
         // Base modifies line 2
         const baseText = "line 1\nline 2 base edit\nline 3";
         const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseText, space });
         const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
-        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
 
         // Orphan modifies line 2 differently
         const orphanText = "line 1\nline 2 orphan edit\nline 3";
         const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanText, space });
         const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
-        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
 
-        const timelineA = [lcaFolderAddr, baseFolderAddr];
-        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const timelineA = [lcaAddr, baseFileAddr];
+        const timelineB = [lcaAddr, orphanFileAddr];
 
         const graftResult = await graftStrategySvc.graftTimelines({
             timelineAddrsA: timelineA,
             timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaFolderAddr,
+            latestCommonFrameAddr: lcaAddr,
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
             ibGibReadCache: {},
             space,
         });
 
         const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
-        const mergedFolder = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
-
-        const mergedChildAddr = mergedFolder.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME]?.at(-1);
-        const fileGet = await getFromSpace({ space, addrs: [mergedChildAddr!] });
-        const mergedFile = fileGet.ibGibs![0] as B2tFSItemIbGib_V1;
+        const mergedFile = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
 
         const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
         const binGet = await getFromSpace({ space, addrs: [binAddr!] });
@@ -323,28 +251,21 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         const lcaFile = await createFileWithContent({ name: 'image.png', content: lcaBinData, space });
         const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
 
-        const lcaFolder = await createFolderItem({ name: 'assets', childAddrs: [lcaAddr], space });
-        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
-
         const baseBinData = new Uint8Array([0x00, 0x01, 0x02, 0x04]);
         const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseBinData, space });
         const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
-        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
 
         const orphanBinData = new Uint8Array([0x00, 0x01, 0x02, 0x05]);
         const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanBinData, space });
         const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
-        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
 
-        const timelineA = [lcaFolderAddr, baseFolderAddr];
-        const timelineB = [lcaFolderAddr, orphanFolderAddr];
+        const timelineA = [lcaAddr, baseFileAddr];
+        const timelineB = [lcaAddr, orphanFileAddr];
 
         const graftResult = await graftStrategySvc.graftTimelines({
             timelineAddrsA: timelineA,
             timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaFolderAddr,
+            latestCommonFrameAddr: lcaAddr,
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
             ibGibReadCache: {},
             space,
@@ -364,26 +285,20 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         const initialText = "base content";
         const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
         const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
-        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
 
         const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "base edit", space });
         const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
-        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
 
         const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "orphan edit", space });
         const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
-        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
 
-        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
-        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+        const timelineA_sender = [lcaAddr, baseFileAddr];
+        const timelineB_receiver = [lcaAddr, orphanFileAddr];
 
         const graftResult = await graftStrategySvc.graftTimelines({
             timelineAddrsA: timelineA_sender,
             timelineAddrsB: timelineB_receiver,
-            latestCommonFrameAddr: lcaFolderAddr,
+            latestCommonFrameAddr: lcaAddr,
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
             ibGibReadCache: {},
             space,
@@ -391,7 +306,7 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         });
 
         iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(orphanFolderAddr);
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(orphanFileAddr);
     });
 
     await ifWe(lc, `respects GraftPreference.sender by using timelineA (sender) as baseTip`, async () => {
@@ -405,26 +320,20 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         const initialText = "base content";
         const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
         const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-        const lcaFolder = await createFolderItem({ name: 'dir', childAddrs: [lcaAddr], space });
-        const lcaFolderAddr = getIbGibAddr({ ibGib: lcaFolder });
 
         const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "sender edit", space });
         const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-        const baseFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [baseFileAddr], space });
-        const baseFolderAddr = getIbGibAddr({ ibGib: baseFolder });
 
         const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "receiver edit", space });
         const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-        const orphanFolder = await evolveFolderItem({ existingItem: lcaFolder, childAddrs: [orphanFileAddr], space });
-        const orphanFolderAddr = getIbGibAddr({ ibGib: orphanFolder });
 
-        const timelineA_sender = [lcaFolderAddr, baseFolderAddr];
-        const timelineB_receiver = [lcaFolderAddr, orphanFolderAddr];
+        const timelineA_sender = [lcaAddr, baseFileAddr];
+        const timelineB_receiver = [lcaAddr, orphanFileAddr];
 
         const graftResult = await graftStrategySvc.graftTimelines({
             timelineAddrsA: timelineA_sender,
             timelineAddrsB: timelineB_receiver,
-            latestCommonFrameAddr: lcaFolderAddr,
+            latestCommonFrameAddr: lcaAddr,
             conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
             ibGibReadCache: {},
             space,
@@ -432,10 +341,6 @@ await respecfully(lc, `B2tFSItem3WayMergeStrategy In-Memory Respecs`, async () =
         });
 
         iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(baseFolderAddr);
+        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(baseFileAddr);
     });
 });
-
-
-
-

package/src/engine/merge/{b2tfs-3way-merge-types.mts → b2tfs-3way-graft-types.mts}

@@ -1,42 +1,34 @@
-import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
-import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
-
-/**
- * Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs
- *
- * ## note on "Details"
- *
- * stupid word "details" is plural and I have this set to be an
- * array. don't have the ability to refactor right now, so this will
- * be mildly confusing unfortunately. Agents should not try to just
- * refactor this on the fly.
- */
-export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the b2tfs item that points to the binary ibgib with text of the
-     * file in `main`
-     */
-    baseTextB2tFSItemAddr: IbGibAddr;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the binary ibgib whose text is in `main`
-     */
-    baseTextBinAddr: IbGibAddr | undefined;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the b2tfs item that points to the binary ibgib with text of the
-     * file in `my-feature-branch`
-     */
-    orphanTextB2tFSItemAddr: IbGibAddr;
-    /**
-     * So if merging `my-feature-branch` into `main`...
-     *
-     * this is the binary ibgib whose text is in `my-feature-branch`
-     */
-    orphanTextBinAddr: IbGibAddr | undefined;
-
-}
+import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
+import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
+
+/**
+ * Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs.
+ */
+export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the b2tfs item that points to the binary ibgib with text of the
+     * file in `main`
+     */
+    baseTextB2tFSItemAddr: IbGibAddr;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the binary ibgib whose text is in `main`
+     */
+    baseTextBinAddr: IbGibAddr | undefined;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the b2tfs item that points to the binary ibgib with text of the
+     * file in `my-feature-branch`
+     */
+    orphanTextB2tFSItemAddr: IbGibAddr;
+    /**
+     * So if merging `my-feature-branch` into `main`...
+     *
+     * this is the binary ibgib whose text is in `my-feature-branch`
+     */
+    orphanTextBinAddr: IbGibAddr | undefined;
+}