parse-conflict-json

WebJar for parse-conflict-json

License	ISC
Categories	JSON Data
GroupId	org.webjars.npm
ArtifactId	parse-conflict-json
Last Version	1.1.1
Release Date	Oct 30, 2020
Type	jar
Description	parse-conflict-json WebJar for parse-conflict-json
Project URL	https://www.webjars.org
Source Code Management	https://github.com/npm/parse-conflict-json

Download parse-conflict-json

Filename	Size
parse-conflict-json-1.1.1.pom
parse-conflict-json-1.1.1.jar	5 KB
parse-conflict-json-1.1.1-sources.jar	22 bytes
parse-conflict-json-1.1.1-javadoc.jar	22 bytes

How to add to project

Apache Maven

<!-- https://jarcasting.com/artifacts/org.webjars.npm/parse-conflict-json/ -->
<dependency>
    <groupId>org.webjars.npm</groupId>
    <artifactId>parse-conflict-json</artifactId>
    <version>1.1.1</version>
</dependency>

Gradle Groovy

// https://jarcasting.com/artifacts/org.webjars.npm/parse-conflict-json/
implementation 'org.webjars.npm:parse-conflict-json:1.1.1'

Gradle Kotlin

// https://jarcasting.com/artifacts/org.webjars.npm/parse-conflict-json/
implementation ("org.webjars.npm:parse-conflict-json:1.1.1")

Apache Buildr

'org.webjars.npm:parse-conflict-json:jar:1.1.1'

Apache Ivy

<dependency org="org.webjars.npm" name="parse-conflict-json" rev="1.1.1">
  <artifact name="parse-conflict-json" type="jar" />
</dependency>

Groovy Grape

@Grapes(
@Grab(group='org.webjars.npm', module='parse-conflict-json', version='1.1.1')
)

Scala SBT

libraryDependencies += "org.webjars.npm" % "parse-conflict-json" % "1.1.1"

Leiningen

[org.webjars.npm/parse-conflict-json "1.1.1"]

Dependencies

compile (3)

Group / Artifact	Type	Version
org.webjars.npm : just-diff	jar	[3.0.1,4)
org.webjars.npm : just-diff-apply	jar	[3.0.0,4)
org.webjars.npm : json-parse-even-better-errors	jar	[2.3.0,3)

Project Modules

There are no modules declared in this project.

parse-conflict-json

Parse a JSON string that has git merge conflicts, resolving if possible.

If the JSON is valid, it just does JSON.parse as normal.

If either side of the conflict is invalid JSON, then an error is thrown for that.

USAGE

// after a git merge that left some conflicts there
const data = fs.readFileSync('package-lock.json', 'utf8')

// reviverFunction is passed to JSON.parse as the reviver function
// preference defaults to 'ours', set to 'theirs' to prefer the other
// side's changes.
const parsed = parseConflictJson(data, reviverFunction, preference)

// returns true if the data looks like a conflicted diff file
parsed.isDiff(data)

Algorithm

If prefer is set to theirs, then the vaules of theirs and ours are switched in the resolver function. (Ie, we'll apply their changes on top of our object, rather than the other way around.)

• Parse the conflicted file into 3 pieces: ours, theirs, and parent

• Get the diff from parent to ours.

• Apply each change of that diff to theirs.

  If any change in the diff set cannot be applied (ie, because they changed an object into a non-object and we changed a field on that object), then replace the object at the specified path with the object at the path in ours.

npm

node package manager

Versions

Version
1.1.1 Oct 30, 2020