@ibgib/vcs-gib 0.0.30 → 0.0.33

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

@@ -1,346 +0,0 @@
-/**
- * @module b2tfs-3way-graft-strategy.respec.node
- *
- * In-memory respec unit tests for B2tFS3WayGraftStrategy.
- */
-
-import {
-    respecfully, ifWe, iReckon,
-    firstOfEach
-} from '@ibgib/helper-gib/dist/respec-gib/respec-gib.mjs';
-
-import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
-import { getGib } from '@ibgib/ts-gib/dist/V1/transforms/transform-helper.mjs';
-import { hash } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
-import { InnerSpace_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-v1.mjs';
-import { DEFAULT_INNER_SPACE_DATA_V1 } from '@ibgib/core-gib/dist/witness/space/inner-space/inner-space-types.mjs';
-import { persistTransformResult, registerNewIbGib, getFromSpace, putInSpace } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
-import { SyncConflictStrategy } from '@ibgib/core-gib/dist/sync/sync-constants.mjs';
-import { GraftPreference } from '@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs';
-import { getBinIb } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
-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 } from '../item/item-types.mjs';
-import { B2tFS3WayGraftStrategy } from './b2tfs-3way-graft-strategy.mjs';
-
-const lc = `[apps/vcs-gib/src/engine/merge/b2tfs-3way-graft-strategy.respec.node.mts]`;
-
-const graftStrategySvc = GraftStrategyService.instance;
-
-function binDataToText(data: any): string {
-    if (!data) { return ''; }
-    if (typeof data === 'string') { return data; }
-    if (typeof data.text === 'string') { return data.text; }
-    if (typeof data.data === 'string') { return data.data; }
-    if (data instanceof Uint8Array || Buffer.isBuffer(data)) {
-        return new TextDecoder('utf8').decode(data);
-    }
-    if (typeof data === 'object') {
-        const vals = Object.values(data);
-        const bytes = new Uint8Array(vals as number[]);
-        return new TextDecoder('utf8').decode(bytes);
-    }
-    return String(data);
-}
-
-async function createFileWithContent({
-    name,
-    content,
-    space,
-}: {
-    name: string;
-    content: string | Uint8Array;
-    space: any;
-}): Promise<B2tFSItemIbGib_V1> {
-    const textStr = typeof content === 'string' ? content : new TextDecoder('utf8').decode(content);
-    const dataBuffer = typeof content === 'string' ? Buffer.from(content, 'utf8') : content;
-    const fileHash = await hash({ s: textStr });
-
-    const fileExt = name.includes('.') ? name.split('.').pop() || 'txt' : 'txt';
-    const binIb = getBinIb({
-        binHash: fileHash,
-        binExt: fileExt,
-        binEncoding: 'utf8',
-    });
-
-    const binIbGib: BinIbGib_V1 = {
-        ib: binIb,
-        data: dataBuffer,
-    };
-    binIbGib.gib = await getGib({ ibGib: binIbGib, hasTjp: false });
-    const binAddr = getIbGibAddr({ ibGib: binIbGib });
-
-    await putInSpace({ ibGib: binIbGib, space });
-    await registerNewIbGib({ ibGib: binIbGib, space });
-
-    const itemRes = await createB2tFSItemIbGib({
-        fsType: 'file',
-        name,
-        rel8ns: {
-            [BINARY_REL8N_NAME]: [binAddr],
-        },
-    });
-
-    await persistTransformResult({ resTransform: itemRes, space });
-    await registerNewIbGib({ ibGib: itemRes.newIbGib, space });
-
-    return itemRes.newIbGib as B2tFSItemIbGib_V1;
-}
-
-async function evolveFileContent({
-    existingItem,
-    newContent,
-    space,
-}: {
-    existingItem: B2tFSItemIbGib_V1;
-    newContent: string | Uint8Array;
-    space: any;
-}): Promise<B2tFSItemIbGib_V1> {
-    const textStr = typeof newContent === 'string' ? newContent : new TextDecoder('utf8').decode(newContent);
-    const dataBuffer = typeof newContent === 'string' ? Buffer.from(newContent, 'utf8') : newContent;
-    const fileHash = await hash({ s: textStr });
-
-    const fileExt = existingItem.data?.fileExt || (existingItem.data?.name?.includes('.') ? existingItem.data.name.split('.').pop() || 'txt' : 'txt');
-    const binIb = getBinIb({
-        binHash: fileHash,
-        binExt: fileExt,
-        binEncoding: 'utf8',
-    });
-
-    const binIbGib: BinIbGib_V1 = {
-        ib: binIb,
-        data: dataBuffer,
-    };
-    binIbGib.gib = await getGib({ ibGib: binIbGib, hasTjp: false });
-    const binAddr = getIbGibAddr({ ibGib: binIbGib });
-
-    await putInSpace({ ibGib: binIbGib, space });
-    await registerNewIbGib({ ibGib: binIbGib, space });
-
-    const evolveRes = await evolveB2tFSItemIbGib({
-        existingItem,
-        rel8nsToUpdate: {
-            [BINARY_REL8N_NAME]: [binAddr],
-        },
-    });
-
-    await persistTransformResult({ resTransform: evolveRes, space });
-    await registerNewIbGib({ ibGib: evolveRes.newIbGib, space });
-
-    return evolveRes.newIbGib as B2tFSItemIbGib_V1;
-}
-
-await respecfully(lc, `B2tFS3WayGraftStrategy In-Memory Respecs`, async () => {
-
-    firstOfEach(lc, async () => {
-        graftStrategySvc.reset();
-        graftStrategySvc.registerStrategy(new B2tFS3WayGraftStrategy());
-    });
-
-    await ifWe(lc, `performs non-conflicting line merges across two branch timelines`, async () => {
-        const space = new InnerSpace_V1({
-            ...DEFAULT_INNER_SPACE_DATA_V1,
-            name: 'test_space_1',
-            uuid: 'test_space_uuid_1',
-        });
-        await space.initialized;
-
-        const initialText = "line 1\nline 2\nline 3";
-        const lcaFile = await createFileWithContent({ name: 'app.ts', content: initialText, space });
-        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-
-        // 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 });
-
-        // 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 timelineA = [lcaAddr, baseFileAddr];
-        const timelineB = [lcaAddr, orphanFileAddr];
-
-        const graftResult = await graftStrategySvc.graftTimelines({
-            timelineAddrsA: timelineA,
-            timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaAddr,
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            ibGibReadCache: {},
-            space,
-        });
-
-        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-
-        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
-        const mergedFile = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
-
-        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
-        iReckon(lc, binAddr).isGonnaBeTruthy();
-
-        const binGet = await getFromSpace({ space, addrs: [binAddr!] });
-        const binIbGib = binGet.ibGibs![0];
-
-        const text = binDataToText(binIbGib.data);
-        iReckon(lc, text).includes('line 1 modified by base');
-        iReckon(lc, text).includes('line 2');
-        iReckon(lc, text).includes('line 3 modified by orphan');
-    });
-
-    await ifWe(lc, `inserts Git conflict markers on conflicting text line merges`, async () => {
-        const space = new InnerSpace_V1({
-            ...DEFAULT_INNER_SPACE_DATA_V1,
-            name: 'test_space_2',
-            uuid: 'test_space_uuid_2',
-        });
-        await space.initialized;
-
-        const initialText = "line 1\nline 2\nline 3";
-        const lcaFile = await createFileWithContent({ name: 'index.ts', content: initialText, space });
-        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-
-        // 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 });
-
-        // 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 timelineA = [lcaAddr, baseFileAddr];
-        const timelineB = [lcaAddr, orphanFileAddr];
-
-        const graftResult = await graftStrategySvc.graftTimelines({
-            timelineAddrsA: timelineA,
-            timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaAddr,
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            ibGibReadCache: {},
-            space,
-        });
-
-        const tipGet = await getFromSpace({ space, addrs: [getIbGibAddr({ ibGib: graftResult.newGraftTip })] });
-        const mergedFile = tipGet.ibGibs![0] as B2tFSItemIbGib_V1;
-
-        const binAddr = mergedFile.rel8ns?.[BINARY_REL8N_NAME]?.at(-1);
-        const binGet = await getFromSpace({ space, addrs: [binAddr!] });
-        const binIbGib = binGet.ibGibs![0];
-
-        const text = binDataToText(binIbGib.data);
-        iReckon(lc, text).includes('<<<<<<< HEAD');
-        iReckon(lc, text).includes('line 2 base edit');
-        iReckon(lc, text).includes('=======');
-        iReckon(lc, text).includes('line 2 orphan edit');
-        iReckon(lc, text).includes('>>>>>>>');
-    });
-
-    await ifWe(lc, `skips line diff merging for non-text binary files`, async () => {
-        const space = new InnerSpace_V1({
-            ...DEFAULT_INNER_SPACE_DATA_V1,
-            name: 'test_space_3',
-            uuid: 'test_space_uuid_3',
-        });
-        await space.initialized;
-
-        const lcaBinData = new Uint8Array([0x00, 0x01, 0x02, 0x03]);
-        const lcaFile = await createFileWithContent({ name: 'image.png', content: lcaBinData, space });
-        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-
-        const baseBinData = new Uint8Array([0x00, 0x01, 0x02, 0x04]);
-        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: baseBinData, space });
-        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-
-        const orphanBinData = new Uint8Array([0x00, 0x01, 0x02, 0x05]);
-        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: orphanBinData, space });
-        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-
-        const timelineA = [lcaAddr, baseFileAddr];
-        const timelineB = [lcaAddr, orphanFileAddr];
-
-        const graftResult = await graftStrategySvc.graftTimelines({
-            timelineAddrsA: timelineA,
-            timelineAddrsB: timelineB,
-            latestCommonFrameAddr: lcaAddr,
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            ibGibReadCache: {},
-            space,
-        });
-
-        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-    });
-
-    await ifWe(lc, `respects GraftPreference.receiver by using timelineB (receiver) as baseTip`, async () => {
-        const space = new InnerSpace_V1({
-            ...DEFAULT_INNER_SPACE_DATA_V1,
-            name: 'test_space_4',
-            uuid: 'test_space_uuid_4',
-        });
-        await space.initialized;
-
-        const initialText = "base content";
-        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
-        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-
-        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "base edit", space });
-        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-
-        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "orphan edit", space });
-        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-
-        const timelineA_sender = [lcaAddr, baseFileAddr];
-        const timelineB_receiver = [lcaAddr, orphanFileAddr];
-
-        const graftResult = await graftStrategySvc.graftTimelines({
-            timelineAddrsA: timelineA_sender,
-            timelineAddrsB: timelineB_receiver,
-            latestCommonFrameAddr: lcaAddr,
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            ibGibReadCache: {},
-            space,
-            graftPreference: GraftPreference.receiver,
-        });
-
-        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(orphanFileAddr);
-    });
-
-    await ifWe(lc, `respects GraftPreference.sender by using timelineA (sender) as baseTip`, async () => {
-        const space = new InnerSpace_V1({
-            ...DEFAULT_INNER_SPACE_DATA_V1,
-            name: 'test_space_5',
-            uuid: 'test_space_uuid_5',
-        });
-        await space.initialized;
-
-        const initialText = "base content";
-        const lcaFile = await createFileWithContent({ name: 'file.txt', content: initialText, space });
-        const lcaAddr = getIbGibAddr({ ibGib: lcaFile });
-
-        const baseFile = await evolveFileContent({ existingItem: lcaFile, newContent: "sender edit", space });
-        const baseFileAddr = getIbGibAddr({ ibGib: baseFile });
-
-        const orphanFile = await evolveFileContent({ existingItem: lcaFile, newContent: "receiver edit", space });
-        const orphanFileAddr = getIbGibAddr({ ibGib: orphanFile });
-
-        const timelineA_sender = [lcaAddr, baseFileAddr];
-        const timelineB_receiver = [lcaAddr, orphanFileAddr];
-
-        const graftResult = await graftStrategySvc.graftTimelines({
-            timelineAddrsA: timelineA_sender,
-            timelineAddrsB: timelineB_receiver,
-            latestCommonFrameAddr: lcaAddr,
-            conflictStrategy: SyncConflictStrategy.optimisticWithLCS,
-            ibGibReadCache: {},
-            space,
-            graftPreference: GraftPreference.sender,
-        });
-
-        iReckon(lc, graftResult.newGraftTip).isGonnaBeTruthy();
-        iReckon(lc, graftResult.newGraftTip.rel8ns?.past).includes(baseFileAddr);
-    });
-});

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

@@ -1,34 +0,0 @@
-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;
-}