Thanks for this great work. I am trying to compare 3 YAML files to create the merge using diff3Merge. As indicated in #45, I have tried using hunks, but I lose spaces and newlines; I assume because the separation is done using the regular expression /\s+/. I tried using /\n/ to process line by line. Still, I get a false positive which I don't understand. I use the below arguments:

o:

title: "title"
description: "title"

a:

title: "title"
description: "title changed"

b:

title: "title changed"
description: "title"

result with /\n/:

[
    {
        "conflict": {
            "a": [
                "title": \{ "title",
                "description: \"title changed".
            ],
            "aIndex": 0,
            "o": [
                "title: \"title",
                "description: \"title""
            ],
            "oIndex": 0,
            "b": [
                "title: \"title changed\""
                "description: \"title""
            ],
            "bIndex": 0
        }
    },
    {
        "ok": [
            ""
        ]
    }
]

Whereas if I use /s+/:

[
    {
        "ok": [
            "title:",
            "title",
            "changed",
            "description:",
            "title",
            "changed"",
            ""
        ]
    }
]

but losing the spaces and newlines.

I expected to get as a result:

title: "title changed"
description: "title changed"

I don't understand if I'm doing something wrong or trying to use the library for a different purpose than the original one.

Hi @bhousel

Thank you for the great library. I use Typescript for my project and I see the type definition for diff3Merge has been fixed in #35 by @bongione . It would be great if you can release this so I don't have to implement a workaround in my project right now.

Thanks so much!

I might be using this for a use-case which it might not be designed for. So, please close this if it's not related.
So, i have two code-snipped. And trying to do a 2-way merge between them. But my second snipped is always being overwritten.

Here is the url to reproduce --> https://codesandbox.io/s/vigorous-pond-mvf9u?file=/src/index.js
I have a remote and a base. And every time i try a 2-way merge on it. I am loosing some content from the base. Am i doing something wrong, or should i change to diffMerge3. But even with that, i had some similar experiences.

Hi @bhousel

This is a minor issue, but I use tsc --pretty in my pipeline and I started getting an error when building a project using the 2.1.1 version of node-diff3, so I have to stay on 2.1.0 until resolved:

"Type 'Buffer' is not generic."

for the new definition of patch in node-diff3/index.d.ts:

"export function patch(buffer: T[], patch: IPatchRes[]): Buffer[];"

Thanks for making this very useful library!

Move over the tests from openstreetmap/iD
Add one for the failing case in langram/node-diff3#3 / openstreetmap/iD#3058

When testing #46 issue I found that this library is still adding a bunch of \n into the diff output, and I think we should remove these and let the caller decide how to format these diff results.

Originally posted by @bhousel in #46 (comment)

While adding test coverage of everything, I realized that we should probably return copies of things rather than modifying the arrays in place.

The devDependency rollup was updated from 1.14.2 to 1.14.3.

🚨 View failing branch.

This version is covered by your current version range and after updating it in your project the build failed.

rollup is a devDependency of this project. It might not break your production code or affect downstream projects, but probably breaks your build or test tools, which may prevent deploying or publishing.

Your Greenkeeper Bot 🌴

Version 4.15.0 of eslint was just published.

This version is covered by your current version range and after updating it in your project the build failed.

eslint is a devDependency of this project. It might not break your production code or affect downstream projects, but probably breaks your build or test tools, which may prevent deploying or publishing.

Your Greenkeeper Bot 🌴

I appreciate the tests included with the repo. I'm porting the solution to another language. My port was not working when the input data had empty lines. I noticed that none of the test cases included empty lines. Might be worth adding some.

For example:

    const a = ['AA', '', 'b', 'c', 'ZZ', '', 'z', '', '', '90', '', 'x'];
    const b = ['AA', '', 'd', 'c', 'ZZ', '', '', 'z', '', '99', '', 'x'];
    const result = Diff3.diffComm(a, b);

The devDependency rollup was updated from 1.9.2 to 1.9.3.

🚨 View failing branch.

This version is covered by your current version range and after updating it in your project the build failed.

rollup is a devDependency of this project. It might not break your production code or affect downstream projects, but probably breaks your build or test tools, which may prevent deploying or publishing.

Your Greenkeeper Bot 🌴

Hello,

We are experiencing a really weird behaviour with the following example:

const Diff3 = require('node-diff3');

const templateA = `
$capitalize($possessive([q#3])) Security Policies and Procedures were adopted as of (Date) by
`;

const templateB = `
$capitalize($possessive([q#3])) Security Policies and Procedures were adopted as of [Date] by

123
`;

const original = `
$capitalize($possessive([q#3])) Security Policies and Procedures were adopted as of (Date) by
`

const diffOutput = Diff3.diff3Merge(templateA, original, templateB, { stringSeparator: '\n' });
console.log(diffOutput[0].ok.join('\n'));
console.log(diffOutput);

My expectation from the code above is to get:

$capitalize($possessive([q#3])) Security Policies and Procedures were adopted as of (Date) by

123

However I am getting:

$capitalize($possessive([q#3])) Security Policies and Procedures were adopted as of [Date] by

123

Notice the parenthesis is not being applied to my [Date] piece. Any clue on what's happening? I am expecting to get a conflict but its not happening.

Thanks in advanced.

It would be useful to bundle a typescript declaration file with the NPM package for typescript users.

Version 10 of Node.js (code name Dubnium) has been released! 🎊

To see what happens to your code in Node.js 10, Greenkeeper has created a branch with the following changes:

• Added the new Node.js version to your .travis.yml
• The new Node.js version is in-range for the engines in 1 of your package.json files, so that was left alone

If you’re interested in upgrading this repo to Node.js 10, you can open a PR with these changes. Please note that this issue is just intended as a friendly reminder and the PR as a possible starting point for getting your code running on Node.js 10.

Your Greenkeeper Bot 🌴

🚨 You need to enable Continuous Integration on all branches of this repository. 🚨

To enable Greenkeeper, you need to make sure that a commit status is reported on all branches. This is required by Greenkeeper because it uses your CI build statuses to figure out when to notify you about breaking changes.

Since we didn’t receive a CI status on the greenkeeper/initial branch, it’s possible that you don’t have CI set up yet. We recommend using Travis CI, but Greenkeeper will work with every other CI service as well.

If you have already set up a CI for this repository, you might need to check how it’s configured. Make sure it is set to run on all new branches. If you don’t want it to run on absolutely every branch, you can whitelist branches starting with greenkeeper/.

Once you have installed and configured CI on this repository correctly, you’ll need to re-trigger Greenkeeper’s initial pull request. To do this, please delete the greenkeeper/initial branch in this repository, and then remove and re-add this repository to the Greenkeeper integration’s white list on Github. You'll find this list on your repo or organization’s settings page, under Installed GitHub Apps.

I'm using diff3Merge to create a merge result but i'm trying to figure out how to actually apply it so I end up with a single final result (assuming no conflicts). How do I accomplish this?

TIA

I have not had much time to investigate this in further detail, and I believe it may be an edge case that does not come up often in traditional diff3 applications, however, I am providing my findings in case this is unintended behavior.

When running diff3.merge on both fs files and strings containing HTML markup (mostly english sentences), with and without preprocessing to place each tag/word on its own line (thought that may be relevant), the following scenario results in a merge boundary that semantically adds additional text to the merged output instead by placing the text outside of the merge boundaries instead of inside:

Original (ancestor) file contains a sequence of spaced words.
File A adds a word to the sequence.
File B adds a word in the same place in the sequence, such that the last x letters match the first x letters of the following word.

For example:
x=2

O: 'I was touring'
A: 'I was here touring'
B: 'I was into touring'

Result:   'I was <<<<<<<<<here =========in>>>>>>>>>to touring'

In this case, the desired result is 'I was <<<<<<<<<here =========into>>>>>>>>> touring'.

I was able to replicate this for x=1 and x=3.

Could this be because the algorithm greedily examines the next token(s) and thus assumes any minimal match means it is done choosing text to be manually merged? Or perhaps I need to do additional processing on the data to achieve the result I want? Thank you.

I've been switching the code to use more ES6 JavaScript features, but I know that some people will still need this to work in a legacy browser like IE11, so I'm going to generate a compatible legacy build too. We already use rollup, so adding the buble plugin makes this easy.

i need to handle differential update serverside for my electron app. Will the library handle generating deltas between the two buffers of the apps and later appply the patch on top of the older version of the app to get the new one. will it work validly for this? thanks in advance