Compare commits
27 commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 17a96be0fc | |||
| 22723cbcae | |||
| 8e237bc232 | |||
| c1bc0b8955 | |||
| 8d14510b1c | |||
| 6d63d0ee8f | |||
| fc0d17837d | |||
| 1c94f771b2 | |||
| bd3c454941 | |||
| 656f3a91df | |||
| b611ac813e | |||
| 4f8abc9ce2 | |||
| 77e5fc07d3 | |||
| f661e1d6f9 | |||
| 4cc0444b5b | |||
| 7ad029924e | |||
| 32d338d496 | |||
| e08ef27d6a | |||
| 149ff8fd95 | |||
|
5d588b1bac | ||
|
|
7759275a53 | ||
|
|
386535497b | ||
| 6d280112fd | |||
| 7c18b6201f | |||
| 40b18721ad | |||
| 6aa7ebf29d | |||
| 25ee83174e |
24 changed files with 791 additions and 531 deletions
74
.forgejo/workflows/check.yml
Normal file
74
.forgejo/workflows/check.yml
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
name: Check
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ['main']
|
||||
pull_request:
|
||||
branches: ['main']
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUSTFLAGS: '-Dwarnings'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: docker
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.x'
|
||||
check-latest: true
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
reconcile-js/node_modules
|
||||
examples/website/node_modules
|
||||
~/.npm
|
||||
key: >-
|
||||
${{ runner.os }}-npm-${{
|
||||
hashFiles(
|
||||
'reconcile-js/package-lock.json',
|
||||
'examples/website/package-lock.json'
|
||||
)
|
||||
}}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-npm-
|
||||
|
||||
- name: Install Rust toolchain
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
|
||||
| sh -s -- -y --default-toolchain none --profile minimal
|
||||
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Install uv
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -LsSf https://astral.sh/uv/install.sh | sh
|
||||
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Lint
|
||||
run: scripts/lint.sh
|
||||
|
||||
- name: Test
|
||||
run: scripts/test.sh
|
||||
|
||||
- name: Build website
|
||||
run: scripts/build-website.sh
|
||||
172
.forgejo/workflows/publish.yml
Normal file
172
.forgejo/workflows/publish.yml
Normal file
|
|
@ -0,0 +1,172 @@
|
|||
name: Publish
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ['main']
|
||||
tags: ['*']
|
||||
workflow_dispatch:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUSTFLAGS: '-Dwarnings'
|
||||
|
||||
concurrency:
|
||||
group: 'pages'
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: docker
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.x'
|
||||
check-latest: true
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
reconcile-js/node_modules
|
||||
examples/website/node_modules
|
||||
~/.npm
|
||||
key: >-
|
||||
${{ runner.os }}-npm-${{
|
||||
hashFiles(
|
||||
'reconcile-js/package-lock.json',
|
||||
'examples/website/package-lock.json'
|
||||
)
|
||||
}}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-npm-
|
||||
|
||||
- name: Install Rust toolchain
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
|
||||
| sh -s -- -y --default-toolchain none --profile minimal
|
||||
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Install uv
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -LsSf https://astral.sh/uv/install.sh | sh
|
||||
echo "$HOME/.local/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Lint
|
||||
run: scripts/lint.sh
|
||||
|
||||
- name: Test
|
||||
run: scripts/test.sh
|
||||
|
||||
- name: Build website
|
||||
run: scripts/build-website.sh
|
||||
|
||||
- name: Deploy to pages mount
|
||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||
run: |
|
||||
apt-get update && apt-get install -y rsync
|
||||
rsync -a --delete examples/website/dist/ /pages/reconcile
|
||||
|
||||
publish-crate:
|
||||
needs: build
|
||||
runs-on: docker
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Install Rust toolchain
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
|
||||
| sh -s -- -y --default-toolchain none --profile minimal
|
||||
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Publish to crates.io
|
||||
run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }}
|
||||
|
||||
publish-npm:
|
||||
needs: build
|
||||
runs-on: docker
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Setup Node
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.x'
|
||||
check-latest: true
|
||||
registry-url: 'https://registry.npmjs.org'
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: |
|
||||
reconcile-js/node_modules
|
||||
~/.npm
|
||||
key: >-
|
||||
${{ runner.os }}-npm-${{
|
||||
hashFiles('reconcile-js/package-lock.json')
|
||||
}}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-npm-
|
||||
|
||||
- name: Install Rust toolchain
|
||||
run: |
|
||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
|
||||
| sh -s -- -y --default-toolchain none --profile minimal
|
||||
echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
|
||||
|
||||
- name: Build website
|
||||
run: scripts/build-website.sh
|
||||
|
||||
- name: Publish reconcile-js to NPM
|
||||
run: |
|
||||
cd reconcile-js
|
||||
cp ../README.md .
|
||||
npm publish
|
||||
env:
|
||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
|
||||
26
.github/dependabot.yml
vendored
26
.github/dependabot.yml
vendored
|
|
@ -1,26 +0,0 @@
|
|||
# To get started with Dependabot version updates, you'll need to specify which
|
||||
# package ecosystems to update and where the package manifests are located.
|
||||
# Please see the documentation for all configuration options:
|
||||
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
|
||||
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: 'cargo'
|
||||
directories: ['**']
|
||||
schedule:
|
||||
interval: 'daily'
|
||||
|
||||
- package-ecosystem: 'github-actions'
|
||||
directories: ['**']
|
||||
schedule:
|
||||
interval: 'daily'
|
||||
|
||||
- package-ecosystem: 'npm'
|
||||
directories: ['/reconcile-js', '/examples/website']
|
||||
schedule:
|
||||
interval: 'daily'
|
||||
|
||||
- package-ecosystem: 'pip'
|
||||
directories: ['/reconcile-python']
|
||||
schedule:
|
||||
interval: 'daily'
|
||||
191
.github/workflows/check.yml
vendored
191
.github/workflows/check.yml
vendored
|
|
@ -1,191 +0,0 @@
|
|||
name: Check & publish
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: ['main']
|
||||
tags: ['*']
|
||||
pull_request:
|
||||
branches: ['main']
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
RUSTFLAGS: '-Dwarnings'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Setup Node.js environment
|
||||
uses: actions/setup-node@v6.3.0
|
||||
with:
|
||||
node-version: '22.x'
|
||||
check-latest: true
|
||||
|
||||
- name: Install uv
|
||||
uses: astral-sh/setup-uv@v6
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Lint
|
||||
run: scripts/lint.sh
|
||||
|
||||
- name: Test
|
||||
run: scripts/test.sh
|
||||
|
||||
publish-crate:
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Publish to crates.io
|
||||
run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }}
|
||||
|
||||
publish-npm:
|
||||
needs: build
|
||||
runs-on: ubuntu-latest
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
permissions:
|
||||
id-token: write
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Setup Node.js environment
|
||||
uses: actions/setup-node@v6.3.0
|
||||
with:
|
||||
node-version: '22.x'
|
||||
check-latest: true
|
||||
registry-url: 'https://registry.npmjs.org'
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
reconcile-js/node_modules
|
||||
~/.npm
|
||||
key: ${{ runner.os }}-npm-${{ hashFiles('reconcile-js/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-npm-
|
||||
|
||||
- name: Build website
|
||||
run: scripts/build-website.sh
|
||||
|
||||
- name: Publish reconcile-js to NPM
|
||||
run: |
|
||||
cd reconcile-js
|
||||
cp ../README.md .
|
||||
npm publish --provenance --access public
|
||||
|
||||
build-python-wheels:
|
||||
needs: build
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
target: x86_64
|
||||
- os: ubuntu-latest
|
||||
target: aarch64
|
||||
- os: macos-latest
|
||||
target: x86_64
|
||||
- os: macos-latest
|
||||
target: aarch64
|
||||
- os: windows-latest
|
||||
target: x86_64
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: actions/setup-python@v6
|
||||
with:
|
||||
python-version: '3.x'
|
||||
|
||||
- uses: PyO3/maturin-action@v1
|
||||
with:
|
||||
target: ${{ matrix.target }}
|
||||
args: --release --out dist --find-interpreter
|
||||
manylinux: auto
|
||||
working-directory: reconcile-python
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: wheels-${{ matrix.os }}-${{ matrix.target }}
|
||||
path: reconcile-python/dist/*.whl
|
||||
|
||||
build-python-sdist:
|
||||
needs: build
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: PyO3/maturin-action@v1
|
||||
with:
|
||||
command: sdist
|
||||
args: --out dist
|
||||
working-directory: reconcile-python
|
||||
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: sdist
|
||||
path: reconcile-python/dist/*.tar.gz
|
||||
|
||||
publish-pypi:
|
||||
needs: [build-python-wheels, build-python-sdist]
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
id-token: write
|
||||
|
||||
steps:
|
||||
- uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: '{wheels-*,sdist}'
|
||||
merge-multiple: true
|
||||
path: dist
|
||||
|
||||
- uses: pypa/gh-action-pypi-publish@release/v1
|
||||
72
.github/workflows/gh-pages.yml
vendored
72
.github/workflows/gh-pages.yml
vendored
|
|
@ -1,72 +0,0 @@
|
|||
name: Deploy Website to GitHub Pages
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
workflow_dispatch:
|
||||
|
||||
# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
|
||||
permissions:
|
||||
contents: read
|
||||
pages: write
|
||||
id-token: write
|
||||
|
||||
# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
|
||||
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
|
||||
concurrency:
|
||||
group: 'pages'
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
|
||||
- name: Cache Rust dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin/
|
||||
~/.cargo/registry/index/
|
||||
~/.cargo/registry/cache/
|
||||
~/.cargo/git/db/
|
||||
target/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Cache npm dependencies
|
||||
uses: actions/cache@v5
|
||||
with:
|
||||
path: |
|
||||
reconcile-js/node_modules
|
||||
~/.npm
|
||||
key: ${{ runner.os }}-npm-${{ hashFiles('reconcile-js/package-lock.json') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-npm-
|
||||
|
||||
- name: Build wasm
|
||||
run: |
|
||||
which wasm-pack || cargo install wasm-pack
|
||||
scripts/build-website.sh
|
||||
|
||||
- name: Upload artifact
|
||||
uses: actions/upload-pages-artifact@v4
|
||||
with:
|
||||
path: examples/website/dist
|
||||
|
||||
deploy:
|
||||
environment:
|
||||
name: github-pages
|
||||
url: ${{ steps.deployment.outputs.page_url }}
|
||||
runs-on: ubuntu-latest
|
||||
needs: build
|
||||
steps:
|
||||
- name: Deploy to GitHub Pages
|
||||
id: deployment
|
||||
uses: actions/deploy-pages@v4
|
||||
3
.vscode/settings.json
vendored
3
.vscode/settings.json
vendored
|
|
@ -8,5 +8,8 @@
|
|||
},
|
||||
"rust-analyzer.cargo.features": [
|
||||
"all"
|
||||
],
|
||||
"python.analysis.extraPaths": [
|
||||
"./reconcile-python/python"
|
||||
]
|
||||
}
|
||||
2
Cargo.lock
generated
2
Cargo.lock
generated
|
|
@ -428,7 +428,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
|
|||
|
||||
[[package]]
|
||||
name = "reconcile-text"
|
||||
version = "0.9.2"
|
||||
version = "0.11.0"
|
||||
dependencies = [
|
||||
"console_error_panic_hook",
|
||||
"diff-match-patch-rs",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
[package]
|
||||
name = "reconcile-text"
|
||||
description = "Intelligent 3-way text merging with automated conflict resolution"
|
||||
version = "0.9.2"
|
||||
version = "0.11.0"
|
||||
rust-version = "1.94"
|
||||
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
|
||||
edition = "2024"
|
||||
|
|
|
|||
|
|
@ -2,40 +2,65 @@
|
|||
|
||||
## Edit Provenance
|
||||
|
||||
Track which changes came from where using `reconcileWithHistory`:
|
||||
Track which changes came from where using `reconcileWithHistory`. The result's
|
||||
`history` field is typed as `SpanWithHistory[]`, and each span's `history` is a
|
||||
`History` string-literal union.
|
||||
|
||||
```javascript
|
||||
const result = reconcileWithHistory(
|
||||
'Hello world',
|
||||
'Hello beautiful world',
|
||||
'Hi world'
|
||||
);
|
||||
```typescript
|
||||
import { reconcileWithHistory, type History, type SpanWithHistory } from 'reconcile-text';
|
||||
|
||||
console.log(result.text); // "Hi beautiful world"
|
||||
console.log(result.history); /*
|
||||
[
|
||||
{
|
||||
"text": "Hello",
|
||||
"history": "RemovedFromRight"
|
||||
},
|
||||
{
|
||||
"text": "Hi",
|
||||
"history": "AddedFromRight"
|
||||
},
|
||||
{
|
||||
"text": " beautiful",
|
||||
"history": "AddedFromLeft"
|
||||
},
|
||||
{
|
||||
"text": " ",
|
||||
"history": "Unchanged"
|
||||
},
|
||||
{
|
||||
"text": "world",
|
||||
"history": "Unchanged"
|
||||
const result = reconcileWithHistory('Hello world', 'Hello beautiful world', 'Hi world');
|
||||
|
||||
console.log(result.text); // "Hi beautiful world"
|
||||
|
||||
const history: SpanWithHistory[] = result.history;
|
||||
console.log(history);
|
||||
// [
|
||||
// { text: "Hello", history: "RemovedFromRight" },
|
||||
// { text: "Hi", history: "AddedFromRight" },
|
||||
// { text: " beautiful", history: "AddedFromLeft" },
|
||||
// { text: " ", history: "Unchanged" },
|
||||
// { text: "world", history: "Unchanged" },
|
||||
// ]
|
||||
|
||||
const classByHistory = {
|
||||
Unchanged: 'merge-unchanged',
|
||||
AddedFromLeft: 'merge-added-left',
|
||||
AddedFromRight: 'merge-added-right',
|
||||
RemovedFromLeft: 'merge-removed-left',
|
||||
RemovedFromRight: 'merge-removed-right',
|
||||
} satisfies Record<History, string>;
|
||||
```
|
||||
|
||||
Using `satisfies Record<History, string>` keeps the object literal's values
|
||||
narrow while forcing every history case to be handled. If a future version adds
|
||||
another `History` value, TypeScript will point at this mapping.
|
||||
|
||||
For control flow, use the same union as an exhaustiveness check:
|
||||
|
||||
```typescript
|
||||
import type { History } from 'reconcile-text';
|
||||
|
||||
function historyLabel(history: History): string {
|
||||
switch (history) {
|
||||
case 'Unchanged':
|
||||
return 'unchanged';
|
||||
case 'AddedFromLeft':
|
||||
return 'added by left';
|
||||
case 'AddedFromRight':
|
||||
return 'added by right';
|
||||
case 'RemovedFromLeft':
|
||||
return 'removed from left';
|
||||
case 'RemovedFromRight':
|
||||
return 'removed from right';
|
||||
default:
|
||||
return assertNever(history);
|
||||
}
|
||||
]
|
||||
*/
|
||||
}
|
||||
|
||||
function assertNever(value: never): never {
|
||||
throw new Error(`Unhandled history value: ${value}`);
|
||||
}
|
||||
```
|
||||
|
||||
## Tokenisation Strategies
|
||||
|
|
@ -45,26 +70,162 @@ console.log(result.history); /*
|
|||
- **Word tokeniser** (`"Word"`) - Splits on word boundaries (recommended for prose)
|
||||
- **Character tokeniser** (`"Character"`) - Individual characters (fine-grained control)
|
||||
- **Line tokeniser** (`"Line"`) - Line-by-line (similar to `git merge` or more precisely [`git merge-file`](https://git-scm.com/docs/git-merge-file))
|
||||
- **Markdown tokeniser** (`"Markdown"`) - Splits on Markdown structural boundaries (headings, list items, paragraphs)
|
||||
|
||||
```typescript
|
||||
import { reconcile, type BuiltinTokenizer } from 'reconcile-text';
|
||||
|
||||
const tokenizers = [
|
||||
'Word',
|
||||
'Character',
|
||||
'Line',
|
||||
'Markdown',
|
||||
] as const satisfies readonly BuiltinTokenizer[];
|
||||
|
||||
const result = reconcile('abc', 'axc', 'abyc', 'Character');
|
||||
console.log(result.text); // "axyc"
|
||||
|
||||
for (const tokenizer of tokenizers) {
|
||||
const merged = reconcile(
|
||||
'# Title\n\n- old item\n',
|
||||
'# Title\n\n- old item\n- left item\n',
|
||||
'# New title\n\n- old item\n',
|
||||
tokenizer
|
||||
);
|
||||
|
||||
console.log(tokenizer, merged.text);
|
||||
}
|
||||
```
|
||||
|
||||
## Cursor Tracking
|
||||
|
||||
`reconcile-text` automatically tracks cursor positions through merges, which is useful for collaborative editors. Selections can be tracked by providing them as a pair of cursors.
|
||||
`reconcile-text` automatically tracks cursor positions through merges, which is
|
||||
useful for collaborative editors. Selections can be tracked by providing them as
|
||||
a pair of cursors.
|
||||
|
||||
```javascript
|
||||
const result = reconcile(
|
||||
'Hello world',
|
||||
{
|
||||
text: 'Hello beautiful world',
|
||||
cursors: [{ id: 1, position: 6 }], // After "Hello "
|
||||
},
|
||||
{
|
||||
text: 'Hi world',
|
||||
cursors: [{ id: 2, position: 0 }], // At the beginning
|
||||
}
|
||||
);
|
||||
```typescript
|
||||
import { reconcile, type TextWithOptionalCursors } from 'reconcile-text';
|
||||
|
||||
const left = {
|
||||
text: 'Hello beautiful world',
|
||||
cursors: [{ id: 1, position: 6 }], // After "Hello "
|
||||
} satisfies TextWithOptionalCursors;
|
||||
|
||||
const right = {
|
||||
text: 'Hi world',
|
||||
cursors: [{ id: 2, position: 0 }], // At the beginning
|
||||
} satisfies TextWithOptionalCursors;
|
||||
|
||||
const result = reconcile('Hello world', left, right);
|
||||
|
||||
// Result: "Hi beautiful world" with repositioned cursors
|
||||
console.log(result.text); // "Hi beautiful world"
|
||||
console.log(result.text); // "Hi beautiful world"
|
||||
console.log(result.cursors); // [{ id: 2, position: 0 }, { id: 1, position: 3 }]
|
||||
```
|
||||
|
||||
> The `cursors` list is sorted by character position (not IDs).
|
||||
|
||||
## Generic Helpers and Inference
|
||||
|
||||
The exported merge functions are intentionally small: they merge strings, or
|
||||
strings plus cursor metadata. In TypeScript applications, keep domain-specific
|
||||
metadata in your own typed wrappers and let inference preserve the surrounding
|
||||
shape.
|
||||
|
||||
```typescript
|
||||
import { reconcile, type BuiltinTokenizer } from 'reconcile-text';
|
||||
|
||||
type ReconciledText<T extends { text: string }> = Omit<T, 'text'> & {
|
||||
text: string;
|
||||
};
|
||||
|
||||
function reconcileDraft<TDraft extends { text: string }>(
|
||||
parent: TDraft,
|
||||
left: TDraft,
|
||||
right: TDraft,
|
||||
tokenizer?: BuiltinTokenizer
|
||||
): ReconciledText<TDraft> {
|
||||
return {
|
||||
...right,
|
||||
text: reconcile(parent.text, left.text, right.text, tokenizer).text,
|
||||
};
|
||||
}
|
||||
|
||||
interface MarkdownDraft {
|
||||
id: string;
|
||||
text: string;
|
||||
updatedAt: Date;
|
||||
}
|
||||
|
||||
const parent: MarkdownDraft = {
|
||||
id: 'intro',
|
||||
text: '# Title\n\nOld text\n',
|
||||
updatedAt: new Date('2026-01-01T00:00:00Z'),
|
||||
};
|
||||
|
||||
const left: MarkdownDraft = {
|
||||
...parent,
|
||||
text: '# Title\n\nOld text\n\n- left note\n',
|
||||
};
|
||||
|
||||
const right: MarkdownDraft = {
|
||||
...parent,
|
||||
text: '# New title\n\nOld text\n',
|
||||
};
|
||||
|
||||
const merged = reconcileDraft(parent, left, right, 'Markdown');
|
||||
// merged is inferred as { id: string; updatedAt: Date; text: string }
|
||||
```
|
||||
|
||||
Use `satisfies` for configuration objects and cursor payloads when you want
|
||||
compile-time checking without widening everything to the library interface.
|
||||
|
||||
```typescript
|
||||
import type { BuiltinTokenizer, TextWithOptionalCursors } from 'reconcile-text';
|
||||
|
||||
const mergeOptions = {
|
||||
tokenizer: 'Markdown',
|
||||
renderDeletedSpans: true,
|
||||
} satisfies {
|
||||
tokenizer: BuiltinTokenizer;
|
||||
renderDeletedSpans: boolean;
|
||||
};
|
||||
|
||||
const documentWithSelection = {
|
||||
text: 'Hello beautiful world',
|
||||
cursors: [
|
||||
{ id: 1, position: 6 },
|
||||
{ id: 2, position: 15 },
|
||||
],
|
||||
} satisfies TextWithOptionalCursors;
|
||||
```
|
||||
|
||||
## Compact Diffs
|
||||
|
||||
Generate and apply compact diff representations. The TypeScript type is
|
||||
`Array<number | string>` for `diff()` and `Array<number | bigint | string>` for
|
||||
`undiff()`, because the underlying WebAssembly layer may represent integer
|
||||
entries as `bigint`.
|
||||
|
||||
```typescript
|
||||
import { diff, undiff } from 'reconcile-text';
|
||||
|
||||
const original = 'Hello world';
|
||||
const changed = 'Hello beautiful world';
|
||||
|
||||
// Generate a compact diff
|
||||
const changes = diff(original, changed);
|
||||
console.log(changes); // [5, " beautiful world"]
|
||||
|
||||
// Reconstruct the changed text from the diff
|
||||
const reconstructed = undiff(original, changes);
|
||||
console.assert(reconstructed === changed);
|
||||
```
|
||||
|
||||
Diff entries are positive integers (retain N characters), negative integers
|
||||
(delete N characters), and strings (insert text).
|
||||
|
||||
## Complete Example
|
||||
|
||||
For a complete browser example that renders `SpanWithHistory` values and cursor
|
||||
selections, see the [example website source](../examples/website/src/index.ts).
|
||||
|
|
|
|||
44
examples/website/package-lock.json
generated
44
examples/website/package-lock.json
generated
|
|
@ -28,7 +28,7 @@
|
|||
},
|
||||
"../../reconcile-js": {
|
||||
"name": "reconcile-text",
|
||||
"version": "0.9.2",
|
||||
"version": "0.11.0",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
|
|
@ -651,16 +651,6 @@
|
|||
"node": ">=20.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@trysound/sax": {
|
||||
"version": "0.2.0",
|
||||
"resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
|
||||
"integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
|
||||
"dev": true,
|
||||
"license": "ISC",
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/body-parser": {
|
||||
"version": "1.19.6",
|
||||
"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",
|
||||
|
|
@ -1180,9 +1170,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/ajv": {
|
||||
"version": "8.17.1",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
|
||||
"integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
|
||||
"version": "8.18.0",
|
||||
"resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz",
|
||||
"integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
@ -3396,9 +3386,9 @@
|
|||
}
|
||||
},
|
||||
"node_modules/lodash": {
|
||||
"version": "4.17.21",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
|
||||
"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
|
||||
"version": "4.17.23",
|
||||
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz",
|
||||
"integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
|
|
@ -4550,6 +4540,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"node_modules/sax": {
|
||||
"version": "1.5.0",
|
||||
"resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
|
||||
"integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
|
||||
"dev": true,
|
||||
"license": "BlueOak-1.0.0",
|
||||
"engines": {
|
||||
"node": ">=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/schema-utils": {
|
||||
"version": "4.3.3",
|
||||
"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz",
|
||||
|
|
@ -5098,19 +5098,19 @@
|
|||
}
|
||||
},
|
||||
"node_modules/svgo": {
|
||||
"version": "3.3.2",
|
||||
"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz",
|
||||
"integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==",
|
||||
"version": "3.3.3",
|
||||
"resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.3.tgz",
|
||||
"integrity": "sha512-+wn7I4p7YgJhHs38k2TNjy1vCfPIfLIJWR5MnCStsN8WuuTcBnRKcMHQLMM2ijxGZmDoZwNv8ipl5aTTen62ng==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@trysound/sax": "0.2.0",
|
||||
"commander": "^7.2.0",
|
||||
"css-select": "^5.1.0",
|
||||
"css-tree": "^2.3.1",
|
||||
"css-what": "^6.1.0",
|
||||
"csso": "^5.0.5",
|
||||
"picocolors": "^1.0.0"
|
||||
"picocolors": "^1.0.0",
|
||||
"sax": "^1.5.0"
|
||||
},
|
||||
"bin": {
|
||||
"svgo": "bin/svgo"
|
||||
|
|
|
|||
|
|
@ -195,28 +195,79 @@
|
|||
|
||||
<footer>
|
||||
<p>© 2025-2026 András Schmelczer</p>
|
||||
<a
|
||||
href="https://github.com/schmelczer/reconcile"
|
||||
class="github-link"
|
||||
aria-label="GitHub repository"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="2"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
<div class="footer-links">
|
||||
<a
|
||||
href="https://www.npmjs.com/package/reconcile-text"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="npm package"
|
||||
>
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
|
||||
<path
|
||||
d="M9 19c-4.3 1.4 -4.3 -2.5 -6 -3m12 5v-3.5c0 -1 .1 -1.4 -.5 -2c2.8 -.3 5.5 -1.4 5.5 -6a4.6 4.6 0 0 0 -1.3 -3.2a4.2 4.2 0 0 0 -.1 -3.2s-1.1 -.3 -3.5 1.3a12.3 12.3 0 0 0 -6.2 0c-2.4 -1.6 -3.5 -1.3 -3.5 -1.3a4.2 4.2 0 0 0 -.1 3.2a4.6 4.6 0 0 0 -1.3 3.2c0 4.6 2.7 5.7 5.5 6c-.6 .6 -.6 1.2 -.5 2v3.5"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
>
|
||||
<path
|
||||
d="M1.763 0C.786 0 0 .786 0 1.763v20.474C0 23.214.786 24 1.763 24h20.474c.977 0 1.763-.786 1.763-1.763V1.763C24 .786 23.214 0 22.237 0zM5.13 5.323l13.837.019-.009 13.836h-3.464l.01-10.382h-3.456L12.04 19.17H5.113z"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
<a
|
||||
href="https://pypi.org/project/reconcile-text/"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="PyPI package"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
>
|
||||
<path
|
||||
d="M23.922 13.58v3.912L20.55 18.72l-.078.055.052.037 3.45-1.256.026-.036v-3.997l-.053-.036-.025.092zM23.621 5.618l-3.04 1.107v3.912l3.339-1.215V5.509zM23.92 13.457V9.544l-3.336 1.215v3.913zM20.47 14.71V10.8L17.17 12v3.913zM17.034 19.996v-3.912l-3.313 1.206v3.912zM17.17 16.057v3.868l3.314-1.206V14.85l-3.314 1.206zm2.093 1.882c-.367.134-.663-.074-.663-.463s.296-.814.663-.947c.365-.133.662.075.662.464s-.297.814-.662.946zM13.225 9.315l.365-.132-3.285-1.197-3.323 1.21.102.037 3.184 1.16zM20.507 10.664V6.751L17.17 7.965v3.913zM17.058 11.918V8.005l-3.302 1.202v3.912zM13.643 9.246l-3.336 1.215v3.913l3.336-1.215zM6.907 13.165l3.322 1.209v-3.913L6.907 9.252zM10.34 7.873l3.281 1.193V5.198l-3.28-1.193zM20.507 2.715L17.19 3.922v3.913l3.317-1.207zM16.95 3.903L13.724 2.73l-3.269 1.19 3.225 1.174zM15.365 4.606l-1.624.592v3.868l3.317-1.207V3.991l-1.693.615zm-.391 2.778c-.367.134-.662-.074-.662-.464s.295-.813.662-.946c.366-.133.663.074.663.464s-.297.813-.663.946zM10.229 18.41v-3.914l-3.322-1.209V17.2zM13.678 17.182v-3.913l-3.371 1.227v3.913zM13.756 17.154l3.3-1.2V12.04l-3.3 1.2zM13.678 21.217l-3.371 1.227v-3.912h-.078v3.912l-3.322-1.209v-3.913l-.053-.058-.025-.06-3.336-1.21v-3.948l.034.013 3.287 1.196.015-.078-3.261-1.187 3.26-1.187v-.109L3.876 9.62l-.307-.112 3.26-1.188v.877l.079-.055V6.769l3.257 1.185.058-.061L7.084 6.75l-.102-.037 3.24-1.179v-.083L6.854 6.677v.018l-.025.018v1.523L3.44 9.47v.02l-.025.017v4.007l-3.39 1.233v.019L0 14.784v3.995l.025.037 3.4 1.237.008-.006.007.01 3.4 1.238.008-.006.006.01 3.4 1.237.014-.009.012.01 3.45-1.256.026-.037-.078-.027zM3.493 9.563l3.257 1.185-3.257 1.187V9.562zM3.4 19.96L.078 18.752v-3.913l2.361.86.96.349v3.913zm.015-3.99L.335 14.85l-.182-.066 3.262-1.187v2.374zm3.399 5.231l-3.321-1.209v-3.912l3.321 1.209v3.912zM23.791 5.434l-3.21-1.17v2.338zM20.387 2.643l-3.24-1.18-3.27 1.19 3.247 1.182z"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
<a
|
||||
href="https://crates.io/crates/reconcile-text"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="crates.io crate"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
>
|
||||
<path
|
||||
d="M23.8346 11.7033l-1.0073-.6236a13.7268 13.7268 0 00-.0283-.2936l.8656-.8069a.3483.3483 0 00-.1154-.578l-1.1066-.414a8.4958 8.4958 0 00-.087-.2856l.6904-.9587a.3462.3462 0 00-.2257-.5446l-1.1663-.1894a9.3574 9.3574 0 00-.1407-.2622l.49-1.0761a.3437.3437 0 00-.0274-.3361.3486.3486 0 00-.3006-.154l-1.1845.0416a6.7444 6.7444 0 00-.1873-.2268l.2723-1.153a.3472.3472 0 00-.417-.4172l-1.1532.2724a14.0183 14.0183 0 00-.2278-.1873l.0415-1.1845a.3442.3442 0 00-.49-.328l-1.076.491c-.0872-.0476-.1742-.0952-.2623-.1407l-.1903-1.1673A.3483.3483 0 0016.256.955l-.9597.6905a8.4867 8.4867 0 00-.2855-.086l-.414-1.1066a.3483.3483 0 00-.5781-.1154l-.8069.8666a9.2936 9.2936 0 00-.2936-.0284L12.2946.1683a.3462.3462 0 00-.5892 0l-.6236 1.0073a13.7383 13.7383 0 00-.2936.0284L9.9803.3374a.3462.3462 0 00-.578.1154l-.4141 1.1065c-.0962.0274-.1903.0567-.2855.086L7.744.955a.3483.3483 0 00-.5447.2258L7.009 2.348a9.3574 9.3574 0 00-.2622.1407l-1.0762-.491a.3462.3462 0 00-.49.328l.0416 1.1845a7.9826 7.9826 0 00-.2278.1873L3.8413 3.425a.3472.3472 0 00-.4171.4171l.2713 1.1531c-.0628.075-.1255.1509-.1863.2268l-1.1845-.0415a.3462.3462 0 00-.328.49l.491 1.0761a9.167 9.167 0 00-.1407.2622l-1.1662.1894a.3483.3483 0 00-.2258.5446l.6904.9587a13.303 13.303 0 00-.087.2855l-1.1065.414a.3483.3483 0 00-.1155.5781l.8656.807a9.2936 9.2936 0 00-.0283.2935l-1.0073.6236a.3442.3442 0 000 .5892l1.0073.6236c.008.0982.0182.1964.0283.2936l-.8656.8079a.3462.3462 0 00.1155.578l1.1065.4141c.0273.0962.0567.1914.087.2855l-.6904.9587a.3452.3452 0 00.2268.5447l1.1662.1893c.0456.088.0922.1751.1408.2622l-.491 1.0762a.3462.3462 0 00.328.49l1.1834-.0415c.0618.0769.1235.1528.1873.2277l-.2713 1.1541a.3462.3462 0 00.4171.4161l1.153-.2713c.075.0638.151.1255.2279.1863l-.0415 1.1845a.3442.3442 0 00.49.327l1.0761-.49c.087.0486.1741.0951.2622.1407l.1903 1.1662a.3483.3483 0 00.5447.2268l.9587-.6904a9.299 9.299 0 00.2855.087l.414 1.1066a.3452.3452 0 00.5781.1154l.8079-.8656c.0972.0111.1954.0203.2936.0294l.6236 1.0073a.3472.3472 0 00.5892 0l.6236-1.0073c.0982-.0091.1964-.0183.2936-.0294l.8069.8656a.3483.3483 0 00.578-.1154l.4141-1.1066a8.4626 8.4626 0 00.2855-.087l.9587.6904a.3452.3452 0 00.5447-.2268l.1903-1.1662c.088-.0456.1751-.0931.2622-.1407l1.0762.49a.3472.3472 0 00.49-.327l-.0415-1.1845a6.7267 6.7267 0 00.2267-.1863l1.1531.2713a.3472.3472 0 00.4171-.416l-.2713-1.1542c.0628-.0749.1255-.1508.1863-.2278l1.1845.0415a.3442.3442 0 00.328-.49l-.49-1.076c.0475-.0872.0951-.1742.1407-.2623l1.1662-.1893a.3483.3483 0 00.2258-.5447l-.6904-.9587.087-.2855 1.1066-.414a.3462.3462 0 00.1154-.5781l-.8656-.8079c.0101-.0972.0202-.1954.0283-.2936l1.0073-.6236a.3442.3442 0 000-.5892zm-6.7413 8.3551a.7138.7138 0 01.2986-1.396.714.714 0 11-.2997 1.396zm-.3422-2.3142a.649.649 0 00-.7715.5l-.3573 1.6685c-1.1035.501-2.3285.7795-3.6193.7795a8.7368 8.7368 0 01-3.6951-.814l-.3574-1.6684a.648.648 0 00-.7714-.499l-1.473.3158a8.7216 8.7216 0 01-.7613-.898h7.1676c.081 0 .1356-.0141.1356-.088v-2.536c0-.074-.0536-.0881-.1356-.0881h-2.0966v-1.6077h2.2677c.2065 0 1.1065.0587 1.394 1.2088.0901.3533.2875 1.5044.4232 1.8729.1346.413.6833 1.2381 1.2685 1.2381h3.5716a.7492.7492 0 00.1296-.0131 8.7874 8.7874 0 01-.8119.9526zM6.8369 20.024a.714.714 0 11-.2997-1.396.714.714 0 01.2997 1.396zM4.1177 8.9972a.7137.7137 0 11-1.304.5791.7137.7137 0 011.304-.579zm-.8352 1.9813l1.5347-.6824a.65.65 0 00.33-.8585l-.3158-.7147h1.2432v5.6025H3.5669a8.7753 8.7753 0 01-.2834-3.348zm6.7343-.5437V8.7836h2.9601c.153 0 1.0792.1772 1.0792.8697 0 .575-.7107.7815-1.2948.7815zm10.7574 1.4862c0 .2187-.008.4363-.0243.651h-.9c-.09 0-.1265.0586-.1265.1477v.413c0 .973-.5487 1.1846-1.0296 1.2382-.4576.0517-.9648-.1913-1.0275-.4717-.2704-1.5186-.7198-1.8436-1.4305-2.4034.8817-.5599 1.799-1.386 1.799-2.4915 0-1.1936-.819-1.9458-1.3769-2.3153-.7825-.5163-1.6491-.6195-1.883-.6195H5.4682a8.7651 8.7651 0 014.907-2.7699l1.0974 1.151a.648.648 0 00.9182.0213l1.227-1.1743a8.7753 8.7753 0 016.0044 4.2762l-.8403 1.8982a.652.652 0 00.33.8585l1.6178.7188c.0283.2875.0425.577.0425.8717zm-9.3006-9.5993a.7128.7128 0 11.984 1.0316.7137.7137 0 01-.984-1.0316zm8.3389 6.71a.7107.7107 0 01.9395-.3625.7137.7137 0 11-.9405.3635z"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
<a
|
||||
href="https://github.com/schmelczer/reconcile"
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
aria-label="GitHub repository"
|
||||
>
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="24"
|
||||
height="24"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="2"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
>
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
|
||||
<path
|
||||
d="M9 19c-4.3 1.4 -4.3 -2.5 -6 -3m12 5v-3.5c0 -1 .1 -1.4 -.5 -2c2.8 -.3 5.5 -1.4 5.5 -6a4.6 4.6 0 0 0 -1.3 -3.2a4.2 4.2 0 0 0 -.1 -3.2s-1.1 -.3 -3.5 1.3a12.3 12.3 0 0 0 -6.2 0c-2.4 -1.6 -3.5 -1.3 -3.5 -1.3a4.2 4.2 0 0 0 -.1 3.2a4.6 4.6 0 0 0 -1.3 3.2c0 4.6 2.7 5.7 5.5 6c-.6 .6 -.6 1.2 -.5 2v3.5"
|
||||
/>
|
||||
</svg>
|
||||
</a>
|
||||
</div>
|
||||
</footer>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -479,27 +479,29 @@ $DOT_RADIUS: 4;
|
|||
}
|
||||
|
||||
footer {
|
||||
padding: 16px;
|
||||
padding: 32px 16px;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 24px;
|
||||
color: $text-secondary;
|
||||
}
|
||||
|
||||
.github-link > svg {
|
||||
position: absolute;
|
||||
.footer-links {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.footer-links > a > svg {
|
||||
color: $text-secondary;
|
||||
top: 50%;
|
||||
right: 36px;
|
||||
transform: translateY(-50%);
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
transition: transform 0.2s;
|
||||
}
|
||||
|
||||
.github-link > svg:hover {
|
||||
.footer-links > a > svg:hover {
|
||||
cursor: pointer;
|
||||
transform: translateY(-50%) scale(1.15);
|
||||
transform: scale(1.15);
|
||||
}
|
||||
|
|
|
|||
6
reconcile-js/package-lock.json
generated
6
reconcile-js/package-lock.json
generated
|
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "reconcile-text",
|
||||
"version": "0.9.2",
|
||||
"version": "0.11.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "reconcile-text",
|
||||
"version": "0.9.2",
|
||||
"version": "0.11.0",
|
||||
"license": "MIT",
|
||||
"devDependencies": {
|
||||
"@types/jest": "^30.0.0",
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
},
|
||||
"../pkg": {
|
||||
"name": "reconcile-text",
|
||||
"version": "0.9.2",
|
||||
"version": "0.11.0",
|
||||
"dev": true,
|
||||
"license": "MIT"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "reconcile-text",
|
||||
"version": "0.9.2",
|
||||
"version": "0.11.0",
|
||||
"description": "Intelligent 3-way text merging with automated conflict resolution",
|
||||
"main": "dist/reconcile.node.js",
|
||||
"browser": "dist/reconcile.web.js",
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
"homepage": "https://schmelczer.dev/reconcile/",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/schmelczer/reconcile.git"
|
||||
"url": "git+https://github.com/schmelczer/reconcile.git"
|
||||
},
|
||||
"bugs": {
|
||||
"url": "https://github.com/schmelczer/reconcile/issues",
|
||||
|
|
|
|||
1
reconcile-python/.gitignore
vendored
1
reconcile-python/.gitignore
vendored
|
|
@ -7,3 +7,4 @@ __pycache__/
|
|||
*.dylib
|
||||
*.dSYM/
|
||||
dist/
|
||||
README.md
|
||||
|
|
|
|||
4
reconcile-python/Cargo.lock
generated
4
reconcile-python/Cargo.lock
generated
|
|
@ -104,14 +104,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "reconcile-text"
|
||||
version = "0.9.1"
|
||||
version = "0.11.0"
|
||||
dependencies = [
|
||||
"thiserror",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "reconcile-text-python"
|
||||
version = "0.9.1"
|
||||
version = "0.11.0"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
"reconcile-text",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "reconcile-text-python"
|
||||
version = "0.9.2"
|
||||
version = "0.11.0"
|
||||
edition = "2024"
|
||||
rust-version = "1.94"
|
||||
authors = ["Andras Schmelczer <andras@schmelczer.dev>"]
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@ build-backend = "maturin"
|
|||
|
||||
[project]
|
||||
name = "reconcile-text"
|
||||
version = "0.9.2"
|
||||
version = "0.11.0"
|
||||
description = "Intelligent 3-way text merging with automated conflict resolution"
|
||||
readme = "../README.md"
|
||||
readme = "README.md"
|
||||
license = { text = "MIT" }
|
||||
authors = [{ name = "Andras Schmelczer", email = "andras@schmelczer.dev" }]
|
||||
requires-python = ">=3.9"
|
||||
|
|
|
|||
2
reconcile-python/uv.lock
generated
2
reconcile-python/uv.lock
generated
|
|
@ -168,7 +168,7 @@ wheels = [
|
|||
|
||||
[[package]]
|
||||
name = "reconcile-text"
|
||||
version = "0.9.1"
|
||||
version = "0.11.0"
|
||||
source = { editable = "." }
|
||||
|
||||
[package.dev-dependencies]
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ NEWVER=$(grep '^version = ' ../Cargo.toml | head -1 | sed 's/version = "\(.*\)"/
|
|||
cd ../reconcile-python
|
||||
sed -i '' "s/^version = \".*\"/version = \"$NEWVER\"/" Cargo.toml
|
||||
sed -i '' "s/^version = \".*\"/version = \"$NEWVER\"/" pyproject.toml
|
||||
cargo update --workspace
|
||||
uv lock
|
||||
|
||||
cd ../examples/website
|
||||
npm install
|
||||
|
|
|
|||
|
|
@ -5,9 +5,6 @@ set -e
|
|||
which cargo-machete || cargo install cargo-machete
|
||||
cargo machete
|
||||
|
||||
which lychee || cargo install lychee
|
||||
lychee --verbose --exclude npmjs.com README.md
|
||||
|
||||
cargo clippy --all-targets --all-features --fix --allow-dirty --allow-staged
|
||||
cargo fmt --all
|
||||
|
||||
|
|
@ -20,6 +17,7 @@ npm ci
|
|||
npm run format
|
||||
|
||||
cd ../../reconcile-python
|
||||
cp ../README.md .
|
||||
uv run maturin develop -q
|
||||
uv run ruff check python/ tests/
|
||||
uv run ruff format python/ tests/
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ npm run test
|
|||
cd -
|
||||
|
||||
cd reconcile-python
|
||||
cp ../README.md .
|
||||
uv run maturin develop
|
||||
uv run pytest -v
|
||||
cd -
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
use std::fmt::Debug;
|
||||
use std::{
|
||||
fmt::Debug,
|
||||
hash::{Hash, Hasher},
|
||||
};
|
||||
|
||||
#[cfg(feature = "serde")]
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
|
@ -78,3 +81,14 @@ where
|
|||
self.normalized == other.normalized
|
||||
}
|
||||
}
|
||||
|
||||
/// Hashes based on the `normalized` field only, consistent with the
|
||||
/// [`PartialEq`] implementation.
|
||||
impl<T> Hash for Token<T>
|
||||
where
|
||||
T: PartialEq + Clone + Debug + Hash,
|
||||
{
|
||||
fn hash<H: Hasher>(&self, state: &mut H) {
|
||||
self.normalized.hash(state);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,13 +11,11 @@
|
|||
//! The implementation of this algorithm is based on the implementation by
|
||||
//! Brandon Williams.
|
||||
//!
|
||||
//! # Heuristics
|
||||
//! # Complexity
|
||||
//!
|
||||
//! At present this implementation of Myers' does not implement any more
|
||||
//! advanced heuristics that would solve some pathological cases. For instance
|
||||
//! passing two large and completely distinct sequences to the algorithm will
|
||||
//! make it spin without making reasonable progress.
|
||||
//! For potential improvements here see [similar#15](https://github.com/mitsuhiko/similar/issues/15).
|
||||
//! The worst case (completely dissimilar inputs) is `O((N+M)²)` time. In
|
||||
//! practice the divide-and-conquer strategy with prefix/suffix stripping keeps
|
||||
//! subproblems small for typical text.
|
||||
|
||||
use std::{
|
||||
fmt::Debug,
|
||||
|
|
@ -41,26 +39,21 @@ pub fn myers_diff<T>(old: &[Token<T>], new: &[Token<T>]) -> Vec<RawOperation<T>>
|
|||
where
|
||||
T: PartialEq + Clone + Debug,
|
||||
{
|
||||
let max_d = (old.len() + new.len()).div_ceil(2) + 1;
|
||||
let mut vb = V::new(max_d);
|
||||
let mut vf = V::new(max_d);
|
||||
let mut result = Vec::new();
|
||||
let max_edit_distance = (old.len() + new.len()).div_ceil(2) + 1;
|
||||
let mut backward_endpoints = FurthestEndpoints::new(max_edit_distance);
|
||||
let mut forward_endpoints = FurthestEndpoints::new(max_edit_distance);
|
||||
let mut result = Vec::with_capacity(old.len() + new.len());
|
||||
|
||||
conquer(
|
||||
old,
|
||||
0..old.len(),
|
||||
new,
|
||||
0..new.len(),
|
||||
&mut vf,
|
||||
&mut vb,
|
||||
&mut forward_endpoints,
|
||||
&mut backward_endpoints,
|
||||
&mut result,
|
||||
);
|
||||
|
||||
debug_assert!(
|
||||
result.iter().all(|op| op.tokens().len() == 1),
|
||||
"All operations must be of length 1"
|
||||
);
|
||||
|
||||
result
|
||||
}
|
||||
|
||||
|
|
@ -68,50 +61,52 @@ where
|
|||
// edges. All D-paths consist of a (D - 1)-path followed by a non-diagonal edge
|
||||
// and then a possibly empty sequence of diagonal edges called a snake.
|
||||
|
||||
/// `V` contains the endpoints of the furthest reaching `D-paths`. For each
|
||||
/// recorded endpoint `(x,y)` in diagonal `k`, we only need to retain `x`
|
||||
/// because `y` can be computed from `x - k`. In other words, `V` is an array of
|
||||
/// integers where `V[k]` contains the row index of the endpoint of the furthest
|
||||
/// reaching path in diagonal `k`.
|
||||
/// Contains the endpoints of the furthest reaching `D-paths`. For each
|
||||
/// recorded endpoint `(x, y)` on diagonal `k`, we only need to retain `x`
|
||||
/// because `y` can be computed from `x - k`. In other words, this is an array
|
||||
/// of integers where `endpoints[k]` contains the row index of the endpoint of
|
||||
/// the furthest reaching path on diagonal `k`.
|
||||
///
|
||||
/// We can't use a traditional Vec to represent `V` since we use `k` as an index
|
||||
/// and it can take on negative values. So instead `V` is represented as a
|
||||
/// light-weight wrapper around a Vec plus an `offset` which is the maximum
|
||||
/// value `k` can take on to map negative `k`'s back to a value >= 0.
|
||||
/// We can't use a traditional Vec since we use `k` as an index and it can take
|
||||
/// on negative values. So instead this is a light-weight wrapper around a Vec
|
||||
/// plus an `offset` which is the maximum value `k` can take on, used to map
|
||||
/// negative `k`'s back to a value >= 0.
|
||||
#[derive(Debug)]
|
||||
struct V {
|
||||
struct FurthestEndpoints {
|
||||
offset: isize,
|
||||
v: Vec<usize>,
|
||||
endpoints: Vec<usize>,
|
||||
}
|
||||
|
||||
impl V {
|
||||
fn new(max_d: usize) -> Self {
|
||||
// max_d should fit in isize for the algorithm to work correctly
|
||||
let offset = isize::try_from(max_d).expect("max_d must fit in isize");
|
||||
impl FurthestEndpoints {
|
||||
fn new(max_edit_distance: usize) -> Self {
|
||||
let offset =
|
||||
isize::try_from(max_edit_distance).expect("max_edit_distance must fit in isize");
|
||||
Self {
|
||||
offset,
|
||||
v: vec![0; 2 * max_d + 1],
|
||||
endpoints: vec![0; 2 * max_edit_distance + 1],
|
||||
}
|
||||
}
|
||||
|
||||
fn len(&self) -> usize {
|
||||
self.v.len()
|
||||
self.endpoints.len()
|
||||
}
|
||||
}
|
||||
|
||||
impl Index<isize> for V {
|
||||
impl Index<isize> for FurthestEndpoints {
|
||||
type Output = usize;
|
||||
|
||||
fn index(&self, index: isize) -> &Self::Output {
|
||||
let idx = usize::try_from(index + self.offset).expect("index + offset must fit in usize");
|
||||
&self.v[idx]
|
||||
fn index(&self, diagonal: isize) -> &Self::Output {
|
||||
let idx =
|
||||
usize::try_from(diagonal + self.offset).expect("diagonal + offset must fit in usize");
|
||||
&self.endpoints[idx]
|
||||
}
|
||||
}
|
||||
|
||||
impl IndexMut<isize> for V {
|
||||
fn index_mut(&mut self, index: isize) -> &mut Self::Output {
|
||||
let idx = usize::try_from(index + self.offset).expect("index + offset must fit in usize");
|
||||
&mut self.v[idx]
|
||||
impl IndexMut<isize> for FurthestEndpoints {
|
||||
fn index_mut(&mut self, diagonal: isize) -> &mut Self::Output {
|
||||
let idx =
|
||||
usize::try_from(diagonal + self.offset).expect("diagonal + offset must fit in usize");
|
||||
&mut self.endpoints[idx]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -119,6 +114,26 @@ fn split_at(range: Range<usize>, at: usize) -> (Range<usize>, Range<usize>) {
|
|||
(range.start..at, at..range.end)
|
||||
}
|
||||
|
||||
/// Adjust a lower diagonal bound so it has the same parity as `edit_distance`.
|
||||
/// Diagonals are visited in steps of 2, so `lower` must share `edit_distance`'s
|
||||
/// parity.
|
||||
fn align_lower_bound(lower: isize, edit_distance: isize) -> isize {
|
||||
if (lower & 1) == (edit_distance & 1) {
|
||||
lower
|
||||
} else {
|
||||
lower + 1
|
||||
}
|
||||
}
|
||||
|
||||
/// Adjust an upper diagonal bound so it has the same parity as `edit_distance`.
|
||||
fn align_upper_bound(upper: isize, edit_distance: isize) -> isize {
|
||||
if (upper & 1) == (edit_distance & 1) {
|
||||
upper
|
||||
} else {
|
||||
upper - 1
|
||||
}
|
||||
}
|
||||
|
||||
/// A `Snake` is a sequence of diagonal edges in the edit graph. Normally
|
||||
/// a snake has a start end end point (and it is possible for a snake to have
|
||||
/// a length of zero, meaning the start and end points are the same) however
|
||||
|
|
@ -135,106 +150,143 @@ fn find_middle_snake<T>(
|
|||
old_range: Range<usize>,
|
||||
new: &[Token<T>],
|
||||
new_range: Range<usize>,
|
||||
vf: &mut V,
|
||||
vb: &mut V,
|
||||
forward_endpoints: &mut FurthestEndpoints,
|
||||
backward_endpoints: &mut FurthestEndpoints,
|
||||
) -> Option<(usize, usize)>
|
||||
where
|
||||
T: PartialEq + Clone + Debug,
|
||||
{
|
||||
let n = old_range.len();
|
||||
let m = new_range.len();
|
||||
let old_len = old_range.len();
|
||||
let new_len = new_range.len();
|
||||
|
||||
let old_len_signed = isize::try_from(old_len).expect("old_len must fit in isize");
|
||||
let new_len_signed = isize::try_from(new_len).expect("new_len must fit in isize");
|
||||
|
||||
// By Lemma 1 in the paper, the optimal edit script length is odd or even as
|
||||
// `delta` is odd or even.
|
||||
let delta = isize::try_from(n).expect("n must fit in isize")
|
||||
- isize::try_from(m).expect("m must fit in isize");
|
||||
let odd = delta & 1 == 1;
|
||||
let delta = old_len_signed - new_len_signed;
|
||||
let delta_is_odd = delta & 1 == 1;
|
||||
|
||||
// The initial point at (0, -1)
|
||||
vf[1] = 0;
|
||||
forward_endpoints[1] = 0;
|
||||
// The initial point at (N, M+1)
|
||||
vb[1] = 0;
|
||||
backward_endpoints[1] = 0;
|
||||
|
||||
let d_max = (n + m).div_ceil(2) + 1;
|
||||
assert!(vf.len() >= d_max);
|
||||
assert!(vb.len() >= d_max);
|
||||
let max_edit_distance = (old_len + new_len).div_ceil(2) + 1;
|
||||
assert!(forward_endpoints.len() >= max_edit_distance);
|
||||
assert!(backward_endpoints.len() >= max_edit_distance);
|
||||
|
||||
let max_edit_distance_signed =
|
||||
isize::try_from(max_edit_distance).expect("max_edit_distance must fit in isize");
|
||||
|
||||
for edit_distance in 0..max_edit_distance_signed {
|
||||
// Tighter diagonal bounds: on diagonal k = x - y the constraints
|
||||
// 0 <= x <= old_len and 0 <= y <= new_len give k in [-new_len, old_len].
|
||||
// Intersect with the algorithm's [-edit_distance, edit_distance]
|
||||
// range and snap to the correct parity (k advances in steps of 2).
|
||||
let forward_diagonal_lo =
|
||||
align_lower_bound((-edit_distance).max(-new_len_signed), edit_distance);
|
||||
let forward_diagonal_hi =
|
||||
align_upper_bound(edit_distance.min(old_len_signed), edit_distance);
|
||||
|
||||
let d_max_isize = isize::try_from(d_max).expect("d_max must fit in isize");
|
||||
for d in 0..d_max_isize {
|
||||
// Forward path
|
||||
for k in (-d..=d).rev().step_by(2) {
|
||||
let mut x = if k == -d || (k != d && vf[k - 1] < vf[k + 1]) {
|
||||
vf[k + 1]
|
||||
for diagonal in (forward_diagonal_lo..=forward_diagonal_hi).rev().step_by(2) {
|
||||
let mut old_idx = if diagonal == -edit_distance
|
||||
|| (diagonal != edit_distance
|
||||
&& forward_endpoints[diagonal - 1] < forward_endpoints[diagonal + 1])
|
||||
{
|
||||
forward_endpoints[diagonal + 1]
|
||||
} else {
|
||||
vf[k - 1] + 1
|
||||
forward_endpoints[diagonal - 1] + 1
|
||||
};
|
||||
let y = usize::try_from(isize::try_from(x).expect("x must fit in isize") - k)
|
||||
.expect("x - k must be non-negative and fit in usize");
|
||||
let new_idx = usize::try_from(
|
||||
isize::try_from(old_idx).expect("old_idx must fit in isize") - diagonal,
|
||||
)
|
||||
.expect("old_idx - diagonal must be non-negative and fit in usize");
|
||||
|
||||
// The coordinate of the start of a snake
|
||||
let (x0, y0) = (x, y);
|
||||
// While these sequences are identical, keep moving through the
|
||||
// graph with no cost
|
||||
if x < old_range.len() && y < new_range.len() {
|
||||
let (snake_start_old, snake_start_new) = (old_idx, new_idx);
|
||||
|
||||
// While these sequences are identical, keep moving through the
|
||||
// graph with no cost
|
||||
if old_idx < old_range.len() && new_idx < new_range.len() {
|
||||
let advance = common_prefix_len(
|
||||
old,
|
||||
old_range.start + x..old_range.end,
|
||||
old_range.start + old_idx..old_range.end,
|
||||
new,
|
||||
new_range.start + y..new_range.end,
|
||||
new_range.start + new_idx..new_range.end,
|
||||
);
|
||||
x += advance;
|
||||
old_idx += advance;
|
||||
}
|
||||
|
||||
// This is the new best x value
|
||||
vf[k] = x;
|
||||
forward_endpoints[diagonal] = old_idx;
|
||||
|
||||
// Only check for connections from the forward search when N - M is
|
||||
// odd and when there is a reciprocal k line coming from the other
|
||||
// direction.
|
||||
if odd && (k - delta).abs() <= (d - 1) {
|
||||
// TODO optimise this so we don't have to compare against n
|
||||
if vf[k] + vb[-(k - delta)] >= n {
|
||||
// Return the snake
|
||||
return Some((x0 + old_range.start, y0 + new_range.start));
|
||||
}
|
||||
// direction. Forward diagonal k maps to backward diagonal
|
||||
// (delta - k). Overlap occurs when the combined forward + backward
|
||||
// reach covers the full width:
|
||||
// forward_endpoints[k] + backward_endpoints[delta - k] >= old_len.
|
||||
if delta_is_odd
|
||||
&& (diagonal - delta).abs() <= (edit_distance - 1)
|
||||
&& forward_endpoints[diagonal] + backward_endpoints[-(diagonal - delta)] >= old_len
|
||||
{
|
||||
return Some((
|
||||
snake_start_old + old_range.start,
|
||||
snake_start_new + new_range.start,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// Backward path
|
||||
for k in (-d..=d).rev().step_by(2) {
|
||||
let mut x = if k == -d || (k != d && vb[k - 1] < vb[k + 1]) {
|
||||
vb[k + 1]
|
||||
} else {
|
||||
vb[k - 1] + 1
|
||||
};
|
||||
let mut y = usize::try_from(isize::try_from(x).expect("x must fit in isize") - k)
|
||||
.expect("x - k must be non-negative and fit in usize");
|
||||
let backward_diagonal_lo =
|
||||
align_lower_bound((-edit_distance).max(-new_len_signed), edit_distance);
|
||||
let backward_diagonal_hi =
|
||||
align_upper_bound(edit_distance.min(old_len_signed), edit_distance);
|
||||
|
||||
// The coordinate of the start of a snake
|
||||
if x < n && y < m {
|
||||
// Backward path
|
||||
for diagonal in (backward_diagonal_lo..=backward_diagonal_hi)
|
||||
.rev()
|
||||
.step_by(2)
|
||||
{
|
||||
let mut old_idx = if diagonal == -edit_distance
|
||||
|| (diagonal != edit_distance
|
||||
&& backward_endpoints[diagonal - 1] < backward_endpoints[diagonal + 1])
|
||||
{
|
||||
backward_endpoints[diagonal + 1]
|
||||
} else {
|
||||
backward_endpoints[diagonal - 1] + 1
|
||||
};
|
||||
let mut new_idx = usize::try_from(
|
||||
isize::try_from(old_idx).expect("old_idx must fit in isize") - diagonal,
|
||||
)
|
||||
.expect("old_idx - diagonal must be non-negative and fit in usize");
|
||||
|
||||
// Extend the snake backward (matching suffix)
|
||||
if old_idx < old_len && new_idx < new_len {
|
||||
let advance = common_suffix_len(
|
||||
old,
|
||||
old_range.start..old_range.start + n - x,
|
||||
old_range.start..old_range.start + old_len - old_idx,
|
||||
new,
|
||||
new_range.start..new_range.start + m - y,
|
||||
new_range.start..new_range.start + new_len - new_idx,
|
||||
);
|
||||
x += advance;
|
||||
y += advance;
|
||||
old_idx += advance;
|
||||
new_idx += advance;
|
||||
}
|
||||
|
||||
// This is the new best x value
|
||||
vb[k] = x;
|
||||
backward_endpoints[diagonal] = old_idx;
|
||||
|
||||
if !odd && (k - delta).abs() <= d {
|
||||
// TODO optimise this so we don't have to compare against n
|
||||
if vb[k] + vf[-(k - delta)] >= n {
|
||||
// Return the snake
|
||||
return Some((n - x + old_range.start, m - y + new_range.start));
|
||||
}
|
||||
if !delta_is_odd
|
||||
&& (diagonal - delta).abs() <= edit_distance
|
||||
&& backward_endpoints[diagonal] + forward_endpoints[-(diagonal - delta)] >= old_len
|
||||
{
|
||||
return Some((
|
||||
old_len - old_idx + old_range.start,
|
||||
new_len - new_idx + new_range.start,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: Maybe there's an opportunity to optimise and bail early?
|
||||
}
|
||||
|
||||
None
|
||||
|
|
@ -245,54 +297,72 @@ fn conquer<T>(
|
|||
mut old_range: Range<usize>,
|
||||
new: &[Token<T>],
|
||||
mut new_range: Range<usize>,
|
||||
vf: &mut V,
|
||||
vb: &mut V,
|
||||
forward_endpoints: &mut FurthestEndpoints,
|
||||
backward_endpoints: &mut FurthestEndpoints,
|
||||
result: &mut Vec<RawOperation<T>>,
|
||||
) where
|
||||
T: PartialEq + Clone + Debug,
|
||||
{
|
||||
// Check for common prefix
|
||||
let common_prefix_len = common_prefix_len(old, old_range.clone(), new, new_range.clone());
|
||||
if common_prefix_len > 0 {
|
||||
let prefix_len = common_prefix_len(old, old_range.clone(), new, new_range.clone());
|
||||
if prefix_len > 0 {
|
||||
result.extend(
|
||||
old[old_range.start..old_range.start + common_prefix_len]
|
||||
old[old_range.start..old_range.start + prefix_len]
|
||||
.iter()
|
||||
.map(|token| RawOperation::Equal(vec![token.clone()])),
|
||||
);
|
||||
}
|
||||
old_range.start += common_prefix_len;
|
||||
new_range.start += common_prefix_len;
|
||||
old_range.start += prefix_len;
|
||||
new_range.start += prefix_len;
|
||||
|
||||
// Check for common suffix
|
||||
let common_suffix_len = common_suffix_len(old, old_range.clone(), new, new_range.clone());
|
||||
let common_suffix = (
|
||||
old_range.end - common_suffix_len,
|
||||
new_range.end - common_suffix_len,
|
||||
);
|
||||
old_range.end -= common_suffix_len;
|
||||
new_range.end -= common_suffix_len;
|
||||
let suffix_len = common_suffix_len(old, old_range.clone(), new, new_range.clone());
|
||||
let suffix_start = old_range.end - suffix_len;
|
||||
old_range.end -= suffix_len;
|
||||
new_range.end -= suffix_len;
|
||||
|
||||
if old_range.is_empty() && new_range.is_empty() {
|
||||
// do nothing
|
||||
} else if new_range.is_empty() {
|
||||
result.extend(
|
||||
old[old_range.start..old_range.start + old_range.len()]
|
||||
old[old_range.start..old_range.end]
|
||||
.iter()
|
||||
.map(|token| RawOperation::Delete(vec![token.clone()])),
|
||||
);
|
||||
} else if old_range.is_empty() {
|
||||
result.extend(
|
||||
new[new_range.start..new_range.start + new_range.len()]
|
||||
new[new_range.start..new_range.end]
|
||||
.iter()
|
||||
.map(|token| RawOperation::Insert(vec![token.clone()])),
|
||||
);
|
||||
} else if let Some((x_start, y_start)) =
|
||||
find_middle_snake(old, old_range.clone(), new, new_range.clone(), vf, vb)
|
||||
{
|
||||
let (old_a, old_b) = split_at(old_range, x_start);
|
||||
let (new_a, new_b) = split_at(new_range, y_start);
|
||||
conquer(old, old_a, new, new_a, vf, vb, result);
|
||||
conquer(old, old_b, new, new_b, vf, vb, result);
|
||||
} else if let Some((split_old, split_new)) = find_middle_snake(
|
||||
old,
|
||||
old_range.clone(),
|
||||
new,
|
||||
new_range.clone(),
|
||||
forward_endpoints,
|
||||
backward_endpoints,
|
||||
) {
|
||||
let (old_before, old_after) = split_at(old_range, split_old);
|
||||
let (new_before, new_after) = split_at(new_range, split_new);
|
||||
conquer(
|
||||
old,
|
||||
old_before,
|
||||
new,
|
||||
new_before,
|
||||
forward_endpoints,
|
||||
backward_endpoints,
|
||||
result,
|
||||
);
|
||||
conquer(
|
||||
old,
|
||||
old_after,
|
||||
new,
|
||||
new_after,
|
||||
forward_endpoints,
|
||||
backward_endpoints,
|
||||
result,
|
||||
);
|
||||
} else {
|
||||
result.extend(
|
||||
old[old_range.start..old_range.end]
|
||||
|
|
@ -306,9 +376,9 @@ fn conquer<T>(
|
|||
);
|
||||
}
|
||||
|
||||
if common_suffix_len > 0 {
|
||||
if suffix_len > 0 {
|
||||
result.extend(
|
||||
old[common_suffix.0..common_suffix.0 + common_suffix_len]
|
||||
old[suffix_start..suffix_start + suffix_len]
|
||||
.iter()
|
||||
.map(|token| RawOperation::Equal(vec![token.clone()])),
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue