28:null 29:["$","title",null,{"children":"Codetations backend: methods for plain text location anchoring | Edward Misback | Observable"}] 2e:T550,d = { const out = new diff.Diff(true) out.tokenize = function(value) { // tokenize usage described at https://github.com/kpdecker/jsdiff/issues/63 // word tokenize example at https://github.com/kpdecker/jsdiff/blob/3b654c2ed7d5262ed9946de841ad8dae990286c7/src/diff/word.js#L34 const extendedWordChars = /^[a-zA-Z\u{C0}-\u{FF}\u{D8}-\u{F6}\u{F8}-\u{2C6}\u{2C8}-\u{2D7}\u{2DE}-\u{2FF}\u{1E00}-\u{1EFF}]+$/u; // All whitespace symbols except newline group into one token, each newline - in separate token // NOTE this can be tuned let tokens = value.split(/([^\S\r\n]+|[()[\]{}'"\r\n\.]|\b)/);//value.split(/([^\S\r\n]+|[()[\]{}'"\r\n\.]|\b)/);//value.split(/(.)/);////value.split(/(.)/);//value.split(/([^\s]+|[()[\]{}'"\.]|\b)/);// //Join the boundary splits that we do not consider to be boundaries. This is primarily the extended Latin character set. // for (let i = 0; i < tokens.length - 1; i++) { // // If we have an empty string in the next field and we have only word chars before and after, merge // if (!tokens[i + 1] && tokens[i + 2] // && extendedWordChars.test(tokens[i]) // && extendedWordChars.test(tokens[i + 2])) { // tokens[i] += tokens[i + 2]; // tokens.splice(i + 1, 2); // i--; // } // } return tokens; }; return out }2f:T630,merge = (s, ds1, ds2) => { // Go from back to front, applying removals first when there are conflicts console.log('start merge', s, ds1, ds2) const order = (a, b) => { const diff = a.index - b.index if (diff) {return -diff } // reverse overall order if (a.added && b.added) { console.log(a, b, a.left ? b.left ? 0 : (a[0][1] === '/' ? 0 : 1) : 0) return a.newline ? 1 : b.newline ? -1 // make sure added lines end up applied last : a.left ? b.left ? 0 : (a[0][1] === '/' ? 0 : 1) : 0} if (a.removed === b.removed) {return -1} // TODO preserve order within removals/additions if (a.removed) {return -1} // Apply removals first return 1 // Flip if order is a:removed, b:added } const sorted = [...ds1.map(d => ({...d, left: true})), ...ds2.map(d => ({...d, right: true}))].sort(order) console.log(sorted) // Move annotations that occur in a removed section back to the start of the section. const reindexed = sorted.reduce(([acc, removeStartIdx], d) => { let index = d.index; if (removeStartIdx === d.index) { removeStartIdx = undefined } if (d.removed) { console.log('HERE', d) removeStartIdx = d.index - d[0].length } else if (removeStartIdx !== undefined && removeStartIdx < d.index) { index = removeStartIdx } return [[...acc, {...d, index}], removeStartIdx] }, [[], undefined])[0].sort(order) console.log(reindexed) return reindexed.reduce((acc, d) => { const out = applyDelta(acc, d) console.log(d[0], d.index, out) return out }, s) }30:Tca7,merge5 = (annT2, newT2) => { if (newT2.length > 500) return ['aborting to avoid performance issue'] // try "looking left and right", since this algo ostensibly likes matching prefixes // also assess range fit const tagRE = /<\/?\d+>/g const tags = [...annT2.matchAll(tagRE)] const reindexed = tags.reduce(([acc, idx], t) => [[...acc, {...t, index: t.index - idx}], idx + t[0].length], [[], 0])[0] let newTags = [] let N = 20 const M = 3 // context for range matching let nSpaces = n => new Array(n).map(v => '').join(' ') const context = (s, i, k) => (s + nSpaces(k)).slice(i, i + k) const pad2sides = (s, k) => (nSpaces(k) + s + nSpaces(k)) const oldT2 = annT2.replaceAll(tagRE, '') const oldT2rev = oldT2.split('').reverse().join('') for (const tag of reindexed) { let idx = tag.index newTags.push({contextR: context(oldT2, idx, N), contextL: context(oldT2rev, oldT2.length - idx, N), tag}) // while (s1[idx-1].match(/[\r\n\s\(\[\{]/)) { // s1 = s1.slice(0, idx-1) + tag[0] + s1[idx-1] + s1.slice(idx + tag[0].length) // idx = idx-1 // } } newTags = newTags.map((t, i) => ({...t, idx: i})) //return newTags //return distance("mn(opQrs)\n ", context(newT2, 5, N)) const newT2rev = newT2.split('').reverse().join('') const isOpen = t => t.tag[0][1] !== '/'; const pairMapping = newTags.filter(isOpen).map(t1 => ({open: t1, close: newTags.find((t2, j) => t2.tag[0].slice(2,-1) === t1.tag[0].slice(1,-1))}) ).map(({open, close}) => [...new Array(newT2.length)].map((_,i) => [...new Array(newT2.length)].map((_,j) => [[i,j], j < i ? -1 : distance(pad2sides(oldT2, M).slice(open.tag.index, close.tag.index), pad2sides(newT2, M).slice(i, j))]))) const fullmapping1 = newTags.map((t) => { return [t.tag[0], [...new Array(newT2.length)].map((_,i) => { // whoops, we need to recover tagIdx const pairIdx = newTags.filter(isOpen).findIndex(t1 => t1.tag[0].slice(1,-1) === t.tag[0].slice(-2,-1)) return (distance(t.contextR, context(newT2, i, N)) * .3 + distance(t.contextL, context(newT2rev, newT2.length - i, N)) * .3 + distance(t.contextR.slice(0, 3), context(newT2, i, 3)) * .2 + distance(t.contextL.slice(0, 3), context(newT2rev, newT2.length - i, 3)) * .2 + /*(isOpen(t) ? pairMapping[pairIdx][i].reduce((sum, v, k) => sum + v[1], 0) : pairMapping[pairIdx].reduce((sum, v, k) => sum + v[i][1], 0)) *(1/25) * .4 + */ (isOpen(t) ? pairMapping[pairIdx][i].reduce(([j, max], v, k) => [v[1] > max ? k : j, v[1] > max ? v[1]: max], [-1, -1])[1] : pairMapping[pairIdx].reduce(([j, max], v, k) => [v[i][1] > max ? k : j, v[i][1] > max ? v[i][1]: max], [-1, -1])[1]) * .4) })] }) //return fullmapping1 const fullmapping = fullmapping1.map(([t, out]) => [t, out.reduce(([i, max], v, j) => [v > max ? j : i, v > max ? v : max], [-1, null])]) //return fullmapping const mapping = fullmapping.map(m => [m[0], m[1][0]]) //return mapping const out = mapping.sort((a, b) => b[1] - a[1] !== 0 ? b[1] - a[1] : a[0][-2] < b[0][-2] ? -1 : 1).reduce((acc, [t, i]) => acc.slice(0, i) + t + acc.slice(i), newT2) return [out, fullmapping] }31:T679,merge4 = (annT2, newT2) => { // try "looking left and right", since this algo likes matching prefixes if (newT2.length > 100) return ['aborting to avoid performance issue'] const tagRE = /<\/?\d+>/g const tags = [...annT2.matchAll(tagRE)] const reindexed = tags.reduce(([acc, idx], t) => [[...acc, {...t, index: t.index - idx}], idx + t[0].length], [[], 0])[0] const newTags = [] let N = 30 let nSpaces = n => new Array(n).map(v => '').join(' ') const context = (s, i, k) => (s + nSpaces(k)).slice(i, i + k).trim() const oldT2 = annT2.replaceAll(tagRE, '') const oldT2rev = oldT2.split('').reverse().join('') for (const tag of reindexed) { let idx = tag.index newTags.push({contextR: context(oldT2, idx, N), contextL: context(oldT2rev, oldT2.length - idx, N), tag}) // while (s1[idx-1].match(/[\r\n\s\(\[\{]/)) { // s1 = s1.slice(0, idx-1) + tag[0] + s1[idx-1] + s1.slice(idx + tag[0].length) // idx = idx-1 // } } //return newTags //return distance("mn(opQrs)\n ", context(newT2, 5, N)) const newT2rev = newT2.split('').reverse().join('') const fullmapping = newTags.map(t => [t.tag[0], [...new Array(newT2.length)].map((_,i) => distance(t.contextR, context(newT2, i, N)) + distance(t.contextL, context(newT2rev, newT2.length - i, N))).reduce(([i, max], v, j) => [v > max ? j : i, v > max ? v : max], [-1, null])]) const mapping = fullmapping.map(m => [m[0], m[1][0]]) //return mapping const out = mapping.sort((a, b) => b[1] - a[1] !== 0 ? b[1] - a[1] : a[0][-2] < b[0][-2] ? -1 : 1).reduce((acc, [t, i]) => acc.slice(0, i) + t + acc.slice(i), newT2) return [out, fullmapping] }32:T4ed,merge3 = (annT2, newT2) => { if (newT2.length > 1000) return ['aborting to avoid performance issue'] const tagRE = /<\/?\d+>/g const tags = [...annT2.matchAll(tagRE)] const reindexed = tags.reduce(([acc, idx], t) => [[...acc, {...t, index: t.index - idx}], idx + t[0].length], [[], 0])[0] const newTags = [] let N = 20 let nSpaces = n => new Array(n).map(v => '').join(' ') const context = (s, i, k) => (nSpaces(k) + s + nSpaces(k)).slice(i, i + k*2).trim() for (const tag of reindexed) { let idx = tag.index newTags.push({context: context(annT2.replaceAll(tagRE, ''), idx, N), tag}) // while (s1[idx-1].match(/[\r\n\s\(\[\{]/)) { // s1 = s1.slice(0, idx-1) + tag[0] + s1[idx-1] + s1.slice(idx + tag[0].length) // idx = idx-1 // } } //return newTags //return distance("mn(opQrs)\n ", context(newT2, 5, N)) const mapping = newTags.map(t => [t.tag[0], [...new Array(newT2.length)].map((_,i) => distance(t.context, context(newT2, i, N))).reduce(([i, max], v, j) => [v > max ? j : i, v > max ? v : max], [-1, null])[0]]) const out = mapping.sort((a, b) => b[1] - a[1] !== 0 ? b[1] - a[1] : a[0][-2] < b[0][-2] ? -1 : 1).reduce((acc, [t, i]) => acc.slice(0, i) + t + acc.slice(i), newT2) return out }33:[] 2c:{"id":"88e85f5624523df6","slug":null,"title":"Codetations backend: methods for plain text location anchoring","thumbnail":"cdc9287fca35c9e6ea9451f42b8ca1b4bff74febc6a2534079ffc5821fc9a6f8","access_level":"public","create_time":"$D2022-12-06T03:41:10.098Z","update_time":"$D2022-12-08T14:59:50.903Z","view_time":null,"first_public_time":"$D2022-12-06T03:41:20.028Z","has_unpublished_edits":null,"fork":false,"stars":0,"starred":false,"owner":{"type":"team","id":"5508584884fd137b","login":"elmisback","name":"Edward Misback","avatar_url":"https://avatars-next.observableusercontent.com/9a42c09ac3fb39913eeacae071d5ba669ac49bf75c82372d0d717ec0acb59024","tier":"starter_2024"},"version":1269,"publish_version":null,"role":null,"authored":false,"authors":[{"type":"individual","id":"e03d30b651790cf0","login":"elmisback","name":"Edward Misback","avatar_url":"https://avatars-next.observableusercontent.com/9a42c09ac3fb39913eeacae071d5ba669ac49bf75c82372d0d717ec0acb59024","tier":null}],"members":[{"type":"individual","id":"e03d30b651790cf0","login":"elmisback","name":"Edward Misback","avatar_url":"https://avatars-next.observableusercontent.com/9a42c09ac3fb39913eeacae071d5ba669ac49bf75c82372d0d717ec0acb59024","tier":null,"role":"editor"}],"comments":[],"custom_thumbnail":false,"trashed":false,"lapsed":null,"subscribed":null,"forks":0,"collection":null,"type":"notebook","body":{"titling":"auto","title":"Codetations backend: methods for plain text location anchoring","cells":[{"id":0,"value":"# Codetations backend: methods for plain text location anchoring","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":1217,"value":"The updates below are performed without access to the edit history of the buffers. The goal is to try to maintain the purpose of the original annotations. \n**Please report obvious bugs in the diffing algorithm output by commenting on this notebook so it can be updated to handle those test cases if possible.**","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":1202,"value":"Original code:","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":237,"value":"viewof oldT2 = Inputs.textarea({value: `\nconst newT2rev = newT2.split('').reverse().join('')\nconst isOpen = t => t.tag[0][1] !== '/';\nconst pairMapping = newTags.filter(isOpen)\n .map(t1 => ({open: t1, \n close: newTags\n .find((t2, j) => t2.tag[0].slice(2,-1) === t1.tag[0].slice(1,-1))}) )// ...\n`, rows: 7})","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":1204,"value":"Original annotations:","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":242,"value":"viewof annT2 = Inputs.textarea({value: `\n<1>const newT2rev = <2>newT2.split('').reverse().join('')\n<3>const isOpen = t => t.tag[0][1] !== '/';\nconst pairMapping = newTags.filter(isOpen)\n .map(<4>t1 => ({open: t1, \n close: newTags\n .find(<6>(t2, j) => <7>t2.tag[0].slice(2,-1) === t1.tag[0].slice(1,-1))}) )// ...\n`, rows: 7})","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":1209,"value":"New code (**try editing this first**):","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":248,"value":"viewof newT2 = Inputs.textarea({value: oldT2, rows: 7})","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":254,"value":"html`New annotations, using diffing with some heuristics about ranges and parentheses:
\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":847,"value":"html`String similarity (Jaro-Winkler):
`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":1240,"value":"viewof doubleSided = Inputs.toggle({label: \"Double-sided\", value: false})","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":983,"value":"html`String similarity (double-sided Jaro-Winkler, very slow implementation):
\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":582,"value":"{\n viewof annT2.value = `\n<1>const newT2rev = <2>newT2.split('').reverse().join('')\n<3>const isOpen = t => t.tag[0][1] !== '/';\nconst pairMapping = newTags.filter(isOpen)\n .map(<4>t1 => ({open: t1, \n close: newTags\n .find(<6>(t2, j) => <7>t2.tag[0].slice(2,-1) === t1.tag[0].slice(1,-1))}) )// ...\n`\n viewof newT2.value = oldT2\n mutable mutT2 = oldT2\n mutable mutAnnT2 = annT2\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":4,"value":"diff = require('diff')","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":29,"value":"oldT = 'abcdefGhi.Lmn(opQrs)'","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":35,"value":"annT = '<3><1>abcdefGhi.Lmn(<2>opQrs)'","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":31,"value":"newT = 'abcdefGhi.Lmn(A + B)'","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":428,"value":"newT1 = 'abcdefGhiLmn(A + B)'","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":161,"value":"$2e","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":703,"value":"lineDiff = new diff.Diff(true)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":714,"value":"newT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":705,"value":"diff.diffLines(oldT2, newT2, {newlineIsToken: true})","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":729,"value":"addIsNewline = ds => {\n const result = []\n for (let i = 0; i < ds.length; i++) {\n const newline = ds[i].added && (!ds[i-1] || ds[i-1]?.value?.endsWith('\\n')) && (ds[i].value.endsWith('\\n') || (!ds[i+1] || ds[i+1]?.value?.startsWith('\\n')))\n result.push({...ds[i], newline})\n }\n return result\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":745,"value":"// addIsNewlineP = ps => {\n// const result = []\n// for (let i = 0; i < ps.length; i++) {\n// const newline = ps[i].added && (!ps[i-1] || ps[i-1]?.[0]?.endsWith('\\n')) && (ps[i][0].endsWith('\\n') || (!ps[i+1] || ps[i+1]?.[0].startsWith('\\n')))\n// result.push({...ps[i], newline})\n// }\n// return result\n// }","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":736,"value":"''.endsWith","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":732,"value":"diffs2Patches(addIsNewline(d.diff(oldT2, newT2)))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":552,"value":"d.diff(oldT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":712,"value":"d.diff(oldT2, annT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":546,"value":"diffs2Patches(d.diff(oldT, newT1))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":187,"value":"diffs2Patches = ds => {\n ds = ds.map((d, i) => ({...d, idx: i})).sort((a, b) => !((a.removed && b.added) || (b.removed && a.added)) ? 0 : Math.abs(a.idx - b.idx) !== 1 ? 0 : d.added ? -1 : 1) // make sure added stuff comes first for adjacent patches\n // NOTEs\n // for .removed, the output index must refer to the starting position in the string from which stuff should be removed\n return ds.reduce(([acc, delta], d) => {\n const d1 = d.added ? 0 : d.value.length\n const index = d.removed ? delta + d1 : delta // removals are indexed by the range's final index\n return [[...acc, {0: d.value, newline: d.newline, index, added: d.added, removed: d.removed, drop: !(d.added || d.removed)}], delta + d1]\n}, [[], 0])[0].filter(o => !o.drop)\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":540,"value":"\"abcdefGhi.Lmn\".split(/(.)/)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":530,"value":"patches(oldT, newT1)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":195,"value":"diffs2Patches(d.diff(oldT, annT))","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":200,"value":"diffs2Patches(d.diff(oldT, newT))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":288,"value":"patches(oldT, newT1)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":223,"value":"merge(oldT, patches(oldT, annT), patches(oldT, newT))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":101,"value":"merge(oldT, patches2(oldAnn), patches2(oldNew))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":344,"value":"mutable mutT2 = oldT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":364,"value":"mutable mutAnnT2 = annT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":367,"value":"//merge(mutable mutT2, patches(mutable mutT2, mutable mutAnnT2), patches(mutable mutT2, newT2))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":346,"value":"{\n mutable mutAnnT2 = merge2(mutable mutT2, mutable mutAnnT2, newT2)\n mutable mutT2 = newT2\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":257,"value":"patches(oldT2, annT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":259,"value":"patches(oldT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":143,"value":"oldT.length","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":232,"value":"patches = (old, current) => diffs2Patches(addIsNewline(d.diff(old, current)))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":82,"value":"applyDelta = (s, d) => {\n const text = d[0]//.slice(2, -2)\n const length = text.length\n if (d.added) {\n return s.slice(0, d.index) + text + s.slice(d.index)\n } else {\n return s.slice(0, d.index - length) + s.slice(d.index)\n }\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":522,"value":"{\n const t0 = performance.now()\n const out = merge2(oldT2, annT2, newT2)\n const t1 = performance.now()\n return [t1 - t0, out]\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":629,"value":"clean = s => {\n // moves tags around in the string according to some rules:\n // * closing tags should never be preceded by a newline/whitespace/open {paren/brace/bracket}, and move back around these characters\n // * opening tags should never be followed by (reverse of stuff above)\n\n const closingTags = s.matchAll(/<\\/\\d+>/g)\n for (const tag of closingTags) {\n let idx = tag.index\n while (s[idx-1].match(/[\\r\\n\\s\$\\[\\{]/)) {\n s = s.slice(0, idx-1) + tag[0] + s[idx-1] + s.slice(idx + tag[0].length)\n idx = idx-1\n console.log(s)\n }\n }\n const openingTags = [...s.matchAll(/<\\d+>/g)]\n for (const tag of openingTags.sort((a,b) => -(a.index - b.index))) {\n let idx = tag.index\n while (s[idx + tag[0].length].match(/[\\r\\n\\s\$\\]\\}]/)) {\n s = s.slice(0, idx) + s[idx + tag[0].length] + tag[0] + s.slice(idx + tag[0].length + 1)\n idx = idx + 1\n console.log(s)\n }\n }\n return s\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":674,"value":"merge2(oldT2, annT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":637,"value":"s = merge1(oldT2, annT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":640,"value":"{\n function swap(s, idx1, idx2) {\n const copy = s.split('')\n copy[idx1] = s[idx2]\n copy[idx2] = s[idx1]\n return copy.join('')\n }\n let s1 = s\n for (const tag of s1.matchAll(/<\\/\\d+>/g)) {\n let idx = tag.index\n while (s1[idx-1].match(/[\\r\\n\\s\\(\\[\\{]/)) {\n s1 = s1.slice(0, idx-1) + tag[0] + s1[idx-1] + s1.slice(idx + tag[0].length)\n idx = idx-1\n }\n }\n return s1\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":627,"value":"merge2 = (s, ann, newT) => clean(merge1(s, ann, newT))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":507,"value":"merge1 = (s, s1, s2) => merge(s, patches(s, s1), patches(s, s2))","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":80,"value":"$2f","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":774,"value":"distance = require('jaro-winkler')","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":781,"value":"oldT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":776,"value":"newT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":779,"value":"annT2","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":849,"value":"merge2(oldT2, annT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":840,"value":"merge3(annT2, newT2)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":980,"value":"merge4(annT2, newT2)[0]","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":857,"value":"//clean(out[0])","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":888,"value":"out = {\n const t0 = performance.now()\n const out = doubleSided && merge5(annT2, newT2)\n return out\n}","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":882,"value":"$30","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":851,"value":"$31","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":788,"value":"$32","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":439,"value":"### old code down here","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"","database":"$undefined"},{"id":41,"value":"oldNew = 'abcdefGhi.Lmn([-opQrs-]{+A + B+})'","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":452,"value":"patches2(oldAnn)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":76,"value":"patches2(oldAnn)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":43,"value":"oldAnn = '{+<3><1>+}abcdefGhi{++}.Lmn({+<2>+}opQrs{++}){++}'","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":78,"value":"patches2(oldNew)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":24,"value":"m = import('https://unpkg.com/three-way-merge@0.1.0/dist/modules/src/index.js?module')","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":88,"value":"patches2(oldAnn)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":84,"value":"applyDelta(oldT, patches2(oldAnn)[0])","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":106,"value":"applyDelta(oldT, patches2(oldNew)[0])","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":114,"value":"patches2(oldNew)","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":92,"value":"patches2(oldAnn)[0][0]","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"},{"id":52,"value":"patches2 = s => [...s.matchAll(/[{\\[][+-].*?[\\]}]/g)].reduce(([acc, delta], o) => {\n const d1 = o[0].length\n // index should be the index of the character the edit precedes\n return [[...acc, ({...o, 0: o[0].slice(2, -2), added: o[0][1] === '+', removed: o[0][1] !== '+', newIndex: o.index, index: o.index - delta})], delta + d1]\n}, [[], 0])[0]","pinned":true,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined","providerMetadata":"$undefined","attachments":"$undefined","output":"$undefined","database":"$undefined"}],"files":"$W33","stdlib":"1"}} 2d:"$2c:body"