@automerge/automerge
Advanced tools
Comparing version 2.1.0-alpha.1 to 2.1.0-alpha.2
@@ -48,3 +48,3 @@ "use strict"; | ||
* doc2 = automerge.change<DocType>(doc2, d => { | ||
* d.ideas.push(new automerge.Text("which records it's history")) | ||
* d.ideas.push(new automerge.Text("which records its history")) | ||
* }) | ||
@@ -61,3 +61,3 @@ * | ||
* let doc3 = automerge.merge(doc1, doc2) | ||
* // doc3 is now {ideas: ["an immutable object", "which records it's history"]} | ||
* // doc3 is now {ideas: ["an immutable object", "which records its history"]} | ||
* ``` | ||
@@ -64,0 +64,0 @@ * |
@@ -617,3 +617,3 @@ "use strict"; | ||
entries() { | ||
const i = 0; | ||
let i = 0; | ||
const iterator = { | ||
@@ -626,5 +626,8 @@ next: () => { | ||
else { | ||
return { value: [i, value], done: false }; | ||
return { value: [i++, value], done: false }; | ||
} | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -638,9 +641,10 @@ return iterator; | ||
next: () => { | ||
let value = undefined; | ||
if (i < len) { | ||
value = i; | ||
i++; | ||
return { value: i++, done: false }; | ||
} | ||
return { value, done: true }; | ||
return { value: undefined, done: true }; | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -650,6 +654,6 @@ return iterator; | ||
values() { | ||
const i = 0; | ||
let i = 0; | ||
const iterator = { | ||
next: () => { | ||
const value = valueAt(target, i); | ||
const value = valueAt(target, i++); | ||
if (value === undefined) { | ||
@@ -662,2 +666,5 @@ return { value: undefined, done: true }; | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -664,0 +671,0 @@ return iterator; |
@@ -14,3 +14,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.isAutomerge = exports.toJS = exports.dump = exports.getHeads = exports.getMissingDeps = exports.decodeSyncMessage = exports.encodeSyncMessage = exports.decodeChange = exports.encodeChange = exports.initSyncState = exports.receiveSyncMessage = exports.generateSyncMessage = exports.decodeSyncState = exports.encodeSyncState = exports.equals = exports.getHistory = exports.applyChanges = exports.getAllChanges = exports.getChanges = exports.getObjectId = exports.getLastLocalChange = exports.getConflicts = exports.getActorId = exports.merge = exports.save = exports.saveIncremental = exports.loadIncremental = exports.load = exports.emptyChange = exports.change = exports.from = exports.free = exports.clone = exports.view = exports.init = exports.getBackend = exports.use = exports.Text = exports.Float64 = exports.Uint = exports.Int = exports.Counter = exports.uuid = void 0; | ||
exports.isAutomerge = exports.toJS = exports.dump = exports.getHeads = exports.getMissingDeps = exports.decodeSyncMessage = exports.encodeSyncMessage = exports.decodeChange = exports.encodeChange = exports.initSyncState = exports.receiveSyncMessage = exports.generateSyncMessage = exports.decodeSyncState = exports.encodeSyncState = exports.equals = exports.diff = exports.getHistory = exports.applyChanges = exports.getAllChanges = exports.getChanges = exports.getObjectId = exports.getLastLocalChange = exports.getConflicts = exports.getActorId = exports.merge = exports.save = exports.saveIncremental = exports.loadIncremental = exports.load = exports.emptyChange = exports.change = exports.from = exports.free = exports.clone = exports.view = exports.init = exports.getBackend = exports.use = exports.Text = exports.Float64 = exports.Uint = exports.Int = exports.Counter = exports.uuid = void 0; | ||
/** @hidden **/ | ||
@@ -615,2 +615,12 @@ var uuid_1 = require("./uuid"); | ||
exports.getHistory = getHistory; | ||
/** | ||
* Create a set of patches representing the change from one set of heads to another | ||
* | ||
* If either of the heads are missing from the document the returned set of patches will be empty | ||
*/ | ||
function diff(doc, before, after) { | ||
const state = (0, internal_state_1._state)(doc); | ||
return state.handle.diff(before, after); | ||
} | ||
exports.diff = diff; | ||
/** @hidden */ | ||
@@ -617,0 +627,0 @@ // FIXME : no tests |
@@ -40,3 +40,3 @@ "use strict"; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
exports.getConflicts = exports.marks = exports.unmark = exports.mark = exports.splice = exports.load = exports.from = exports.clone = exports.init = exports.getBackend = exports.RawString = exports.getObjectId = exports.isAutomerge = exports.toJS = exports.dump = exports.getMissingDeps = exports.decodeSyncMessage = exports.encodeSyncMessage = exports.decodeChange = exports.encodeChange = exports.initSyncState = exports.receiveSyncMessage = exports.generateSyncMessage = exports.decodeSyncState = exports.encodeSyncState = exports.equals = exports.getHistory = exports.applyChanges = exports.getAllChanges = exports.getChanges = exports.getLastLocalChange = exports.getActorId = exports.merge = exports.save = exports.loadIncremental = exports.emptyChange = exports.change = exports.getHeads = exports.free = exports.view = exports.Float64 = exports.Uint = exports.Int = exports.Counter = void 0; | ||
exports.getConflicts = exports.marks = exports.unmark = exports.mark = exports.splice = exports.load = exports.from = exports.clone = exports.init = exports.getBackend = exports.RawString = exports.diff = exports.getObjectId = exports.isAutomerge = exports.toJS = exports.dump = exports.getMissingDeps = exports.decodeSyncMessage = exports.encodeSyncMessage = exports.decodeChange = exports.encodeChange = exports.initSyncState = exports.receiveSyncMessage = exports.generateSyncMessage = exports.decodeSyncState = exports.encodeSyncState = exports.equals = exports.getHistory = exports.applyChanges = exports.getAllChanges = exports.getChanges = exports.getLastLocalChange = exports.getActorId = exports.merge = exports.save = exports.loadIncremental = exports.emptyChange = exports.change = exports.getHeads = exports.free = exports.view = exports.Float64 = exports.Uint = exports.Int = exports.Counter = void 0; | ||
var unstable_types_1 = require("./unstable_types"); | ||
@@ -78,2 +78,3 @@ Object.defineProperty(exports, "Counter", { enumerable: true, get: function () { return unstable_types_1.Counter; } }); | ||
Object.defineProperty(exports, "getObjectId", { enumerable: true, get: function () { return stable_1.getObjectId; } }); | ||
Object.defineProperty(exports, "diff", { enumerable: true, get: function () { return stable_1.diff; } }); | ||
const stable = require("./stable"); | ||
@@ -80,0 +81,0 @@ var raw_string_1 = require("./raw_string"); |
@@ -31,3 +31,3 @@ /** | ||
* doc2 = automerge.change<DocType>(doc2, d => { | ||
* d.ideas.push(new automerge.Text("which records it's history")) | ||
* d.ideas.push(new automerge.Text("which records its history")) | ||
* }) | ||
@@ -44,3 +44,3 @@ * | ||
* let doc3 = automerge.merge(doc1, doc2) | ||
* // doc3 is now {ideas: ["an immutable object", "which records it's history"]} | ||
* // doc3 is now {ideas: ["an immutable object", "which records its history"]} | ||
* ``` | ||
@@ -47,0 +47,0 @@ * |
@@ -31,3 +31,3 @@ /** | ||
* doc2 = automerge.change<DocType>(doc2, d => { | ||
* d.ideas.push(new automerge.Text("which records it's history")) | ||
* d.ideas.push(new automerge.Text("which records its history")) | ||
* }) | ||
@@ -44,3 +44,3 @@ * | ||
* let doc3 = automerge.merge(doc1, doc2) | ||
* // doc3 is now {ideas: ["an immutable object", "which records it's history"]} | ||
* // doc3 is now {ideas: ["an immutable object", "which records its history"]} | ||
* ``` | ||
@@ -47,0 +47,0 @@ * |
@@ -610,3 +610,3 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ | ||
entries() { | ||
const i = 0; | ||
let i = 0; | ||
const iterator = { | ||
@@ -619,5 +619,8 @@ next: () => { | ||
else { | ||
return { value: [i, value], done: false }; | ||
return { value: [i++, value], done: false }; | ||
} | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -631,9 +634,10 @@ return iterator; | ||
next: () => { | ||
let value = undefined; | ||
if (i < len) { | ||
value = i; | ||
i++; | ||
return { value: i++, done: false }; | ||
} | ||
return { value, done: true }; | ||
return { value: undefined, done: true }; | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -643,6 +647,6 @@ return iterator; | ||
values() { | ||
const i = 0; | ||
let i = 0; | ||
const iterator = { | ||
next: () => { | ||
const value = valueAt(target, i); | ||
const value = valueAt(target, i++); | ||
if (value === undefined) { | ||
@@ -655,2 +659,5 @@ return { value: undefined, done: true }; | ||
}, | ||
[Symbol.iterator]() { | ||
return this; | ||
}, | ||
}; | ||
@@ -657,0 +664,0 @@ return iterator; |
@@ -583,2 +583,11 @@ var __rest = (this && this.__rest) || function (s, e) { | ||
} | ||
/** | ||
* Create a set of patches representing the change from one set of heads to another | ||
* | ||
* If either of the heads are missing from the document the returned set of patches will be empty | ||
*/ | ||
export function diff(doc, before, after) { | ||
const state = _state(doc); | ||
return state.handle.diff(before, after); | ||
} | ||
/** @hidden */ | ||
@@ -585,0 +594,0 @@ // FIXME : no tests |
@@ -40,3 +40,3 @@ /** | ||
import { unstableConflictAt } from "./conflicts"; | ||
export { view, free, getHeads, change, emptyChange, loadIncremental, save, merge, getActorId, getLastLocalChange, getChanges, getAllChanges, applyChanges, getHistory, equals, encodeSyncState, decodeSyncState, generateSyncMessage, receiveSyncMessage, initSyncState, encodeChange, decodeChange, encodeSyncMessage, decodeSyncMessage, getMissingDeps, dump, toJS, isAutomerge, getObjectId, } from "./stable"; | ||
export { view, free, getHeads, change, emptyChange, loadIncremental, save, merge, getActorId, getLastLocalChange, getChanges, getAllChanges, applyChanges, getHistory, equals, encodeSyncState, decodeSyncState, generateSyncMessage, receiveSyncMessage, initSyncState, encodeChange, decodeChange, encodeSyncMessage, decodeSyncMessage, getMissingDeps, dump, toJS, isAutomerge, getObjectId, diff, } from "./stable"; | ||
import * as stable from "./stable"; | ||
@@ -43,0 +43,0 @@ export { RawString } from "./raw_string"; |
/** @hidden **/ | ||
export { /** @hidden */ uuid } from "./uuid"; | ||
import { type AutomergeValue, type Doc, type PatchCallback } from "./types"; | ||
import { type AutomergeValue, type Doc, type PatchCallback, type Patch } from "./types"; | ||
export { type AutomergeValue, Counter, type Doc, Int, Uint, Float64, type Patch, type PatchCallback, type ScalarValue, } from "./types"; | ||
@@ -380,2 +380,8 @@ export { Text } from "./text"; | ||
export declare function getHistory<T>(doc: Doc<T>): State<T>[]; | ||
/** | ||
* Create a set of patches representing the change from one set of heads to another | ||
* | ||
* If either of the heads are missing from the document the returned set of patches will be empty | ||
*/ | ||
export declare function diff(doc: Doc<any>, before: Heads, after: Heads): Patch[]; | ||
/** @hidden */ | ||
@@ -382,0 +388,0 @@ export declare function equals(val1: unknown, val2: unknown): boolean; |
@@ -42,5 +42,5 @@ /** | ||
import { type UnstableConflicts as Conflicts } from "./conflicts"; | ||
export type { PutPatch, DelPatch, SpliceTextPatch, InsertPatch, IncPatch, SyncMessage, } from "@automerge/automerge-wasm"; | ||
export type { PutPatch, DelPatch, SpliceTextPatch, InsertPatch, IncPatch, SyncMessage, Heads, } from "@automerge/automerge-wasm"; | ||
export type { ChangeOptions, ApplyOptions, ChangeFn } from "./stable"; | ||
export { view, free, getHeads, change, emptyChange, loadIncremental, save, merge, getActorId, getLastLocalChange, getChanges, getAllChanges, applyChanges, getHistory, equals, encodeSyncState, decodeSyncState, generateSyncMessage, receiveSyncMessage, initSyncState, encodeChange, decodeChange, encodeSyncMessage, decodeSyncMessage, getMissingDeps, dump, toJS, isAutomerge, getObjectId, } from "./stable"; | ||
export { view, free, getHeads, change, emptyChange, loadIncremental, save, merge, getActorId, getLastLocalChange, getChanges, getAllChanges, applyChanges, getHistory, equals, encodeSyncState, decodeSyncState, generateSyncMessage, receiveSyncMessage, initSyncState, encodeChange, decodeChange, encodeSyncMessage, decodeSyncMessage, getMissingDeps, dump, toJS, isAutomerge, getObjectId, diff, } from "./stable"; | ||
export type InitOptions<T> = { | ||
@@ -47,0 +47,0 @@ /** The actor ID to use for this document, a random one will be generated if `null` is passed */ |
@@ -7,3 +7,3 @@ { | ||
], | ||
"version": "2.1.0-alpha.1", | ||
"version": "2.1.0-alpha.2", | ||
"description": "Javascript implementation of automerge, backed by @automerge/automerge-wasm", | ||
@@ -54,5 +54,5 @@ "homepage": "https://github.com/automerge/automerge/tree/main/javascript", | ||
"dependencies": { | ||
"@automerge/automerge-wasm": "^0.2.0", | ||
"@automerge/automerge-wasm": "^0.2.1", | ||
"uuid": "^9.0.0" | ||
} | ||
} |
235652
6322