@pilotiq/pilotiq 0.8.2 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +2 -2
- package/CHANGELOG.md +213 -0
- package/dist/Pilotiq.d.ts +55 -0
- package/dist/Pilotiq.d.ts.map +1 -1
- package/dist/Pilotiq.js +21 -0
- package/dist/Pilotiq.js.map +1 -1
- package/dist/Resource.d.ts +39 -0
- package/dist/Resource.d.ts.map +1 -1
- package/dist/Resource.js +30 -0
- package/dist/Resource.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/pageData/helpers.d.ts +19 -1
- package/dist/pageData/helpers.d.ts.map +1 -1
- package/dist/pageData/helpers.js +33 -0
- package/dist/pageData/helpers.js.map +1 -1
- package/dist/pageData/navigation.d.ts +17 -1
- package/dist/pageData/navigation.d.ts.map +1 -1
- package/dist/pageData/navigation.js +14 -0
- package/dist/pageData/navigation.js.map +1 -1
- package/dist/pageData/resourcePages.d.ts.map +1 -1
- package/dist/pageData/resourcePages.js +17 -2
- package/dist/pageData/resourcePages.js.map +1 -1
- package/dist/pageData.d.ts +1 -1
- package/dist/pageData.d.ts.map +1 -1
- package/dist/pageData.js +1 -1
- package/dist/pageData.js.map +1 -1
- package/dist/react/AppShell.d.ts +5 -0
- package/dist/react/AppShell.d.ts.map +1 -1
- package/dist/react/AppShell.js +1 -1
- package/dist/react/AppShell.js.map +1 -1
- package/dist/react/FormCollabBindingRegistry.d.ts +71 -1
- package/dist/react/FormCollabBindingRegistry.d.ts.map +1 -1
- package/dist/react/FormCollabBindingRegistry.js.map +1 -1
- package/dist/react/FormStateContext.d.ts +17 -0
- package/dist/react/FormStateContext.d.ts.map +1 -1
- package/dist/react/FormStateContext.js +44 -3
- package/dist/react/FormStateContext.js.map +1 -1
- package/dist/react/RecordWrapperGate.d.ts +19 -6
- package/dist/react/RecordWrapperGate.d.ts.map +1 -1
- package/dist/react/RecordWrapperGate.js +18 -8
- package/dist/react/RecordWrapperGate.js.map +1 -1
- package/dist/react/fields/MarkdownInput.d.ts.map +1 -1
- package/dist/react/fields/MarkdownInput.js +105 -3
- package/dist/react/fields/MarkdownInput.js.map +1 -1
- package/dist/react/fields/TextLikeInput.d.ts +10 -0
- package/dist/react/fields/TextLikeInput.d.ts.map +1 -1
- package/dist/react/fields/TextLikeInput.js +179 -0
- package/dist/react/fields/TextLikeInput.js.map +1 -1
- package/dist/react/fields/textDelta.d.ts +44 -0
- package/dist/react/fields/textDelta.d.ts.map +1 -0
- package/dist/react/fields/textDelta.js +80 -0
- package/dist/react/fields/textDelta.js.map +1 -0
- package/dist/react/index.d.ts +2 -2
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +1 -1
- package/dist/react/index.js.map +1 -1
- package/dist/react/parseRecordEditUrl.d.ts +33 -9
- package/dist/react/parseRecordEditUrl.d.ts.map +1 -1
- package/dist/react/parseRecordEditUrl.js +40 -2
- package/dist/react/parseRecordEditUrl.js.map +1 -1
- package/package.json +1 -1
- package/src/Pilotiq.ts +64 -0
- package/src/Resource.test.ts +44 -0
- package/src/Resource.ts +58 -0
- package/src/index.ts +2 -0
- package/src/pageData/helpers.ts +40 -1
- package/src/pageData/navigation.ts +32 -1
- package/src/pageData/resourcePages.ts +17 -1
- package/src/pageData.test.ts +137 -0
- package/src/pageData.ts +1 -0
- package/src/react/AppShell.tsx +6 -1
- package/src/react/FormCollabBindingRegistry.ts +63 -1
- package/src/react/FormStateContext.tsx +62 -3
- package/src/react/RecordWrapperGate.tsx +26 -8
- package/src/react/fields/MarkdownInput.tsx +100 -3
- package/src/react/fields/TextLikeInput.tsx +203 -1
- package/src/react/fields/textDelta.test.ts +141 -0
- package/src/react/fields/textDelta.ts +86 -0
- package/src/react/index.ts +9 -1
- package/src/react/parseRecordEditUrl.test.ts +48 -1
- package/src/react/parseRecordEditUrl.ts +52 -13
|
@@ -1,8 +1,10 @@
|
|
|
1
|
-
import React from 'react'
|
|
1
|
+
import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
|
2
2
|
import type { ElementMeta } from '../../schema/Element.js'
|
|
3
|
+
import type { TextBinding } from '../FormCollabBindingRegistry.js'
|
|
3
4
|
import { useFieldState } from '../FormStateContext.js'
|
|
4
5
|
import { Input } from '../ui/input.js'
|
|
5
6
|
import { Textarea } from '../ui/textarea.js'
|
|
7
|
+
import { computeDelta, preserveCursor } from './textDelta.js'
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* Bridge between controlled (FormStateProvider) and uncontrolled
|
|
@@ -10,6 +12,16 @@ import { Textarea } from '../ui/textarea.js'
|
|
|
10
12
|
* `live()` fields, the input is bound to the context's values map and
|
|
11
13
|
* fires the live trigger on change/blur according to the field's `live`
|
|
12
14
|
* config. Outside a controlled form, falls back to plain `defaultValue`.
|
|
15
|
+
*
|
|
16
|
+
* **Phase F.6 — character-level CRDT branch.** When a `<RecordCollabRoom>`
|
|
17
|
+
* is mounted up-tree AND `@pilotiq-pro/collab`'s binding registered a
|
|
18
|
+
* `TextBinding` for this field (text-shaped fieldType + `.collab() !== false`),
|
|
19
|
+
* the input takes the `BoundTextInput` path: edits emit `TextDelta`s to
|
|
20
|
+
* the binding's `Y.Text`, remote changes flow back via `observe`, and
|
|
21
|
+
* cursor position survives both. The legacy whole-string LWW path
|
|
22
|
+
* still runs for non-text fields, non-collab forms, and masked inputs
|
|
23
|
+
* (mask + character-level CRDT is incompatible — peers would see raw
|
|
24
|
+
* keystrokes desynced from the rendered mask).
|
|
13
25
|
*/
|
|
14
26
|
export function TextLikeInput({
|
|
15
27
|
el, name, common, type, extraProps, multiline, applyMask,
|
|
@@ -33,6 +45,28 @@ export function TextLikeInput({
|
|
|
33
45
|
const onBlurMode = liveOpts.onBlur === true
|
|
34
46
|
const mask = applyMask ?? identity
|
|
35
47
|
|
|
48
|
+
// Phase F.6 — character-level CRDT path. Masking is mutually exclusive
|
|
49
|
+
// with character-level CRDT (peers would see raw keystrokes diverged
|
|
50
|
+
// from the local mask render); masked fields fall through to LWW.
|
|
51
|
+
// We read the mask from the field meta directly — `applyMask` is a
|
|
52
|
+
// `useCallback`-wrapped fn that's *always* defined (identity when no
|
|
53
|
+
// mask), so its truthiness can't gate the branch.
|
|
54
|
+
const hasMask = typeof el['mask'] === 'string'
|
|
55
|
+
if (fs.textBinding && !hasMask) {
|
|
56
|
+
return (
|
|
57
|
+
<BoundTextInput
|
|
58
|
+
binding={fs.textBinding}
|
|
59
|
+
name={name}
|
|
60
|
+
triggerLive={fs.triggerLive}
|
|
61
|
+
onBlurMode={onBlurMode}
|
|
62
|
+
common={common}
|
|
63
|
+
extraProps={extraProps}
|
|
64
|
+
type={type}
|
|
65
|
+
multiline={multiline}
|
|
66
|
+
/>
|
|
67
|
+
)
|
|
68
|
+
}
|
|
69
|
+
|
|
36
70
|
if (fs.controlled) {
|
|
37
71
|
const ctxValue = fs.value !== undefined && fs.value !== null ? String(fs.value) : ''
|
|
38
72
|
const onChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>): void => {
|
|
@@ -71,4 +105,172 @@ export function TextLikeInput({
|
|
|
71
105
|
return <Input {...(common as React.ComponentProps<typeof Input>)} type={type} {...extraProps} />
|
|
72
106
|
}
|
|
73
107
|
|
|
108
|
+
/**
|
|
109
|
+
* Phase F.6 — CRDT-bound text input. Owns its own controlled state
|
|
110
|
+
* because the binding's `Y.Text` is the source of truth (not the
|
|
111
|
+
* form's `values` map). Mirrors every committed value back into the
|
|
112
|
+
* form context via `fs.setValue` so submission / live re-resolve see
|
|
113
|
+
* the latest string.
|
|
114
|
+
*
|
|
115
|
+
* Lifecycle:
|
|
116
|
+
* - Mount: seed local state from `binding.read()`; mirror it into
|
|
117
|
+
* the form's `values` map.
|
|
118
|
+
* - Local edit: compute a `TextDelta` (insert / delete / replace)
|
|
119
|
+
* from the before/after strings and `applyDelta` to the binding.
|
|
120
|
+
* Eagerly update local state in the same React render so the
|
|
121
|
+
* controlled input doesn't lag the keystroke.
|
|
122
|
+
* - Remote edit: `binding.observe` fires with the post-change
|
|
123
|
+
* string; we replace local state and best-effort preserve the
|
|
124
|
+
* local cursor via `preserveCursor`. The local-echo of our own
|
|
125
|
+
* `applyDelta` is collapsed by the value-equality check.
|
|
126
|
+
* - IME composition: `applyDelta` is deferred to `compositionend`
|
|
127
|
+
* so the binding never sees intermediate composing chars (which
|
|
128
|
+
* would emit one delta per keystroke and confuse downstream
|
|
129
|
+
* observers).
|
|
130
|
+
*/
|
|
131
|
+
function BoundTextInput({
|
|
132
|
+
binding, name, triggerLive, onBlurMode, common, extraProps, type, multiline,
|
|
133
|
+
}: {
|
|
134
|
+
binding: TextBinding
|
|
135
|
+
name: string
|
|
136
|
+
triggerLive: (valueOverride?: unknown) => void
|
|
137
|
+
onBlurMode: boolean
|
|
138
|
+
common: Record<string, unknown>
|
|
139
|
+
extraProps: Record<string, unknown>
|
|
140
|
+
type: string
|
|
141
|
+
multiline: boolean
|
|
142
|
+
}): React.ReactElement {
|
|
143
|
+
const fs = useFieldState(name)
|
|
144
|
+
// SSR-rendered default. Captured once at mount; used as display
|
|
145
|
+
// fallback while the room's `Y.Text` is still empty (the seed race
|
|
146
|
+
// for Y.Text isn't safe across concurrent first-mounters, so no peer
|
|
147
|
+
// populates it client-side — see `@pilotiq-pro/collab` for the
|
|
148
|
+
// rationale). First user edit emits a replace-from-empty delta that
|
|
149
|
+
// atomically lifts the displayed value into the CRDT.
|
|
150
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
151
|
+
const fallback = useMemo(() => stringValue(fs.value), [])
|
|
152
|
+
const [value, setValueLocal] = useState<string>(() => binding.read() || fallback)
|
|
153
|
+
const valueRef = useRef<string>(value)
|
|
154
|
+
const isComposing = useRef<boolean>(false)
|
|
155
|
+
const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement | null>(null)
|
|
156
|
+
|
|
157
|
+
useEffect(() => { valueRef.current = value }, [value])
|
|
158
|
+
|
|
159
|
+
// Stable ref to the form-mirror writer so the observer effect below
|
|
160
|
+
// doesn't tear down on every render (fs.setValue is a fresh arrow on
|
|
161
|
+
// every useFieldState call).
|
|
162
|
+
const mirrorRef = useRef<(v: string) => void>(() => {})
|
|
163
|
+
useEffect(() => {
|
|
164
|
+
mirrorRef.current = (v: string): void => { fs.setValue(v) }
|
|
165
|
+
})
|
|
166
|
+
|
|
167
|
+
// On mount / binding swap: read the binding's current state. If
|
|
168
|
+
// non-empty (i.e. someone else has already typed), display it and
|
|
169
|
+
// mirror into the form values map. If empty, leave the fallback
|
|
170
|
+
// showing — no client-side seed (see file-header comment).
|
|
171
|
+
useEffect(() => {
|
|
172
|
+
const initial = binding.read()
|
|
173
|
+
if (initial.length > 0) {
|
|
174
|
+
setValueLocal(initial)
|
|
175
|
+
valueRef.current = initial
|
|
176
|
+
mirrorRef.current(initial)
|
|
177
|
+
}
|
|
178
|
+
}, [binding])
|
|
179
|
+
|
|
180
|
+
// Subscribe to text-CRDT changes. Yjs fires this for BOTH local and
|
|
181
|
+
// remote transactions — local echoes are collapsed by the
|
|
182
|
+
// `next === prev` guard.
|
|
183
|
+
useEffect(() => {
|
|
184
|
+
const unsubscribe = binding.observe((next) => {
|
|
185
|
+
const prev = valueRef.current
|
|
186
|
+
if (next === prev) return
|
|
187
|
+
const el = inputRef.current
|
|
188
|
+
const cursor = el?.selectionStart ?? next.length
|
|
189
|
+
const restored = preserveCursor(prev, next, cursor)
|
|
190
|
+
setValueLocal(next)
|
|
191
|
+
valueRef.current = next
|
|
192
|
+
mirrorRef.current(next)
|
|
193
|
+
// Defer cursor restore until after React commits. Only reapply
|
|
194
|
+
// when the input is still focused — yanking the selection on a
|
|
195
|
+
// blurred field would steal focus across the page.
|
|
196
|
+
requestAnimationFrame(() => {
|
|
197
|
+
if (!el) return
|
|
198
|
+
if (document.activeElement !== el) return
|
|
199
|
+
try { el.setSelectionRange(restored, restored) } catch { /* setSelectionRange unsupported on some input types — defensive */ }
|
|
200
|
+
})
|
|
201
|
+
})
|
|
202
|
+
return unsubscribe
|
|
203
|
+
}, [binding])
|
|
204
|
+
|
|
205
|
+
const commitDelta = useCallback((after: string): void => {
|
|
206
|
+
// Compute the delta against the binding's *current* Y.Text contents
|
|
207
|
+
// — not the renderer's `before` ref. The two can diverge in three
|
|
208
|
+
// cases that all converge correctly under this approach:
|
|
209
|
+
// 1. First edit when Y.Text is empty: delta = `insert@0 <whole>`,
|
|
210
|
+
// which atomically lifts the displayed fallback into the CRDT
|
|
211
|
+
// without a separate seed op.
|
|
212
|
+
// 2. After a remote-applied update: Y.Text holds the peer's value;
|
|
213
|
+
// computing against it avoids "ghost" deltas that re-emit ops
|
|
214
|
+
// against a stale local ref.
|
|
215
|
+
// 3. After a server-resolve `triggerLive` replace: same as (2).
|
|
216
|
+
const before = binding.read()
|
|
217
|
+
if (after === before) return
|
|
218
|
+
const delta = computeDelta(before, after)
|
|
219
|
+
if (!delta) return
|
|
220
|
+
binding.applyDelta(delta)
|
|
221
|
+
// Eager local + form-map update so the controlled input doesn't
|
|
222
|
+
// wait on the observer echo to render the new keystroke. Observer
|
|
223
|
+
// will fire with the same string and short-circuit via the equality
|
|
224
|
+
// check above.
|
|
225
|
+
setValueLocal(after)
|
|
226
|
+
valueRef.current = after
|
|
227
|
+
mirrorRef.current(after)
|
|
228
|
+
if (!onBlurMode) triggerLive(after)
|
|
229
|
+
}, [binding, onBlurMode, triggerLive])
|
|
230
|
+
|
|
231
|
+
const onChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>): void => {
|
|
232
|
+
if (isComposing.current) {
|
|
233
|
+
// IME mid-composition — paint locally, hold the delta until commit.
|
|
234
|
+
setValueLocal(e.target.value)
|
|
235
|
+
return
|
|
236
|
+
}
|
|
237
|
+
commitDelta(e.target.value)
|
|
238
|
+
}
|
|
239
|
+
|
|
240
|
+
const onCompositionStart = (): void => { isComposing.current = true }
|
|
241
|
+
const onCompositionEnd = (e: React.CompositionEvent<HTMLInputElement | HTMLTextAreaElement>): void => {
|
|
242
|
+
isComposing.current = false
|
|
243
|
+
commitDelta(e.currentTarget.value)
|
|
244
|
+
}
|
|
245
|
+
|
|
246
|
+
const onBlur = (): void => {
|
|
247
|
+
if (onBlurMode) triggerLive(valueRef.current)
|
|
248
|
+
}
|
|
249
|
+
|
|
250
|
+
const setRef = (el: HTMLInputElement | HTMLTextAreaElement | null): void => {
|
|
251
|
+
inputRef.current = el
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
const props = {
|
|
255
|
+
...common,
|
|
256
|
+
...extraProps,
|
|
257
|
+
defaultValue: undefined,
|
|
258
|
+
value,
|
|
259
|
+
onChange,
|
|
260
|
+
onBlur,
|
|
261
|
+
onCompositionStart,
|
|
262
|
+
onCompositionEnd,
|
|
263
|
+
ref: setRef,
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
if (multiline) return <Textarea {...(props as React.ComponentProps<typeof Textarea>)} />
|
|
267
|
+
return <Input {...(props as React.ComponentProps<typeof Input>)} type={type} />
|
|
268
|
+
}
|
|
269
|
+
|
|
74
270
|
function identity(v: string): string { return v }
|
|
271
|
+
|
|
272
|
+
function stringValue(v: unknown): string {
|
|
273
|
+
if (v === undefined || v === null) return ''
|
|
274
|
+
if (typeof v === 'string') return v
|
|
275
|
+
return String(v)
|
|
276
|
+
}
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
import { describe, it } from 'node:test'
|
|
2
|
+
import assert from 'node:assert/strict'
|
|
3
|
+
|
|
4
|
+
import { computeDelta, preserveCursor } from './textDelta.js'
|
|
5
|
+
|
|
6
|
+
describe('computeDelta — string-diff to TextDelta', () => {
|
|
7
|
+
it('returns null for identical strings', () => {
|
|
8
|
+
assert.equal(computeDelta('hello', 'hello'), null)
|
|
9
|
+
assert.equal(computeDelta('', ''), null)
|
|
10
|
+
})
|
|
11
|
+
|
|
12
|
+
it('emits insert when text is appended', () => {
|
|
13
|
+
assert.deepEqual(
|
|
14
|
+
computeDelta('hello', 'hello!'),
|
|
15
|
+
{ kind: 'insert', index: 5, text: '!' },
|
|
16
|
+
)
|
|
17
|
+
})
|
|
18
|
+
|
|
19
|
+
it('emits insert when text is prepended', () => {
|
|
20
|
+
assert.deepEqual(
|
|
21
|
+
computeDelta('world', 'hello world'),
|
|
22
|
+
{ kind: 'insert', index: 0, text: 'hello ' },
|
|
23
|
+
)
|
|
24
|
+
})
|
|
25
|
+
|
|
26
|
+
it('emits insert when text is spliced mid-string', () => {
|
|
27
|
+
// Inserting an 'l' to make 'helo' → 'hello'. The longest common
|
|
28
|
+
// prefix is 'hel' (3 chars — before[2]='l' and after[2]='l' both
|
|
29
|
+
// match), so the insertion lands at index 3. Either interpretation
|
|
30
|
+
// (index 2 or index 3) produces the same CRDT result; the diff
|
|
31
|
+
// picks the rightmost feasible point deterministically.
|
|
32
|
+
assert.deepEqual(
|
|
33
|
+
computeDelta('helo', 'hello'),
|
|
34
|
+
{ kind: 'insert', index: 3, text: 'l' },
|
|
35
|
+
)
|
|
36
|
+
})
|
|
37
|
+
|
|
38
|
+
it('emits delete when a trailing run is removed', () => {
|
|
39
|
+
assert.deepEqual(
|
|
40
|
+
computeDelta('hello!', 'hello'),
|
|
41
|
+
{ kind: 'delete', index: 5, length: 1 },
|
|
42
|
+
)
|
|
43
|
+
})
|
|
44
|
+
|
|
45
|
+
it('emits delete when a leading run is removed', () => {
|
|
46
|
+
assert.deepEqual(
|
|
47
|
+
computeDelta('hello world', 'world'),
|
|
48
|
+
{ kind: 'delete', index: 0, length: 6 },
|
|
49
|
+
)
|
|
50
|
+
})
|
|
51
|
+
|
|
52
|
+
it('emits delete when a mid-string run is removed', () => {
|
|
53
|
+
assert.deepEqual(
|
|
54
|
+
computeDelta('hello', 'hlo'),
|
|
55
|
+
{ kind: 'delete', index: 1, length: 2 },
|
|
56
|
+
)
|
|
57
|
+
})
|
|
58
|
+
|
|
59
|
+
it('emits replace when a mid-string selection is swapped', () => {
|
|
60
|
+
assert.deepEqual(
|
|
61
|
+
computeDelta('hello world', 'hello pilot'),
|
|
62
|
+
{ kind: 'replace', from: 6, to: 11, text: 'pilot' },
|
|
63
|
+
)
|
|
64
|
+
})
|
|
65
|
+
|
|
66
|
+
it('emits replace when the whole string is swapped', () => {
|
|
67
|
+
assert.deepEqual(
|
|
68
|
+
computeDelta('foo', 'bar'),
|
|
69
|
+
{ kind: 'replace', from: 0, to: 3, text: 'bar' },
|
|
70
|
+
)
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
it('emits insert when growing from empty', () => {
|
|
74
|
+
assert.deepEqual(
|
|
75
|
+
computeDelta('', 'a'),
|
|
76
|
+
{ kind: 'insert', index: 0, text: 'a' },
|
|
77
|
+
)
|
|
78
|
+
})
|
|
79
|
+
|
|
80
|
+
it('emits delete when shrinking to empty', () => {
|
|
81
|
+
assert.deepEqual(
|
|
82
|
+
computeDelta('abc', ''),
|
|
83
|
+
{ kind: 'delete', index: 0, length: 3 },
|
|
84
|
+
)
|
|
85
|
+
})
|
|
86
|
+
|
|
87
|
+
it('handles repeated-char shrink without prefix/suffix overlap', () => {
|
|
88
|
+
// 'aaa' → 'aa' — the prefix walk could greedily eat all 2 chars from
|
|
89
|
+
// the after side; the suffix cap must stop suffix at 2 so beforeMid
|
|
90
|
+
// is 'a' (length 1) instead of '' (length 0, identity).
|
|
91
|
+
assert.deepEqual(
|
|
92
|
+
computeDelta('aaa', 'aa'),
|
|
93
|
+
{ kind: 'delete', index: 2, length: 1 },
|
|
94
|
+
)
|
|
95
|
+
})
|
|
96
|
+
})
|
|
97
|
+
|
|
98
|
+
describe('preserveCursor — anchor across remote edits', () => {
|
|
99
|
+
it('returns input cursor when strings are identical', () => {
|
|
100
|
+
assert.equal(preserveCursor('hello', 'hello', 3), 3)
|
|
101
|
+
})
|
|
102
|
+
|
|
103
|
+
it('leaves cursor untouched when edit lands AFTER cursor', () => {
|
|
104
|
+
// Cursor at index 2 ('he|llo'); remote appends ' world'. Edit prefix
|
|
105
|
+
// length is 5, cursor 2 ≤ prefix → no shift.
|
|
106
|
+
assert.equal(preserveCursor('hello', 'hello world', 2), 2)
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
it('shifts cursor when edit lands BEFORE cursor', () => {
|
|
110
|
+
// Cursor at 5 ('hello|'); remote prepends 'XX '. The common prefix
|
|
111
|
+
// is empty, so cursor > prefix → shift by (8 − 5) = 3, landing at
|
|
112
|
+
// 8 (the end of the new string, same logical position as before).
|
|
113
|
+
assert.equal(preserveCursor('hello', 'XX hello', 5), 8)
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('lands at end-of-string for non-contiguous edits (heuristic limit)', () => {
|
|
117
|
+
// Both-sides insertion ('hello' → 'X hello world') flattens into a
|
|
118
|
+
// single full-string `replace` at the diff layer because the prefix
|
|
119
|
+
// and suffix walks find no common ground. Cursor lands at the end
|
|
120
|
+
// of the new string — imperfect for this case but harmless. A
|
|
121
|
+
// future v2 using Yjs `RelativePosition` would land it at 7
|
|
122
|
+
// (just after the original 'hello' substring).
|
|
123
|
+
assert.equal(preserveCursor('hello', 'X hello world', 5), 13)
|
|
124
|
+
})
|
|
125
|
+
|
|
126
|
+
it('clamps cursor when remote deletes around the cursor', () => {
|
|
127
|
+
// Cursor at 5 ('hello|world'); remote deletes 'hello'. Prefix is 0,
|
|
128
|
+
// delta is -5 → shifted to 0.
|
|
129
|
+
assert.equal(preserveCursor('helloworld', 'world', 5), 0)
|
|
130
|
+
})
|
|
131
|
+
|
|
132
|
+
it('never returns a negative cursor', () => {
|
|
133
|
+
assert.equal(preserveCursor('abcdef', '', 3), 0)
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
it('never returns a cursor past the new length', () => {
|
|
137
|
+
// Defensive — caller might pass a stale cursor longer than the new
|
|
138
|
+
// string. Clamp to new bounds.
|
|
139
|
+
assert.equal(preserveCursor('hello', 'hi', 10), 2)
|
|
140
|
+
})
|
|
141
|
+
})
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
import type { TextDelta } from '../FormCollabBindingRegistry.js'
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Phase F.6 — derive a single character-level edit op from two strings.
|
|
5
|
+
*
|
|
6
|
+
* Strategy: find the longest common prefix and suffix between `before`
|
|
7
|
+
* and `after`; whatever's left in the middle is the changed region.
|
|
8
|
+
*
|
|
9
|
+
* - middle-after empty + middle-before non-empty → `delete`
|
|
10
|
+
* - middle-before empty + middle-after non-empty → `insert`
|
|
11
|
+
* - both non-empty → `replace`
|
|
12
|
+
* - both empty (identical strings) → `null`
|
|
13
|
+
*
|
|
14
|
+
* This correctly handles the common edit shapes: single-key insert,
|
|
15
|
+
* single-key backspace, multi-char paste replacing a selection, IME
|
|
16
|
+
* commits, accent-key composition. It does NOT preserve user intent
|
|
17
|
+
* when the same character appears at multiple positions and the edit
|
|
18
|
+
* could be attributed to either occurrence — Yjs's per-character
|
|
19
|
+
* identity makes that distinction lossy at the string-diff layer
|
|
20
|
+
* (the `Y.Text` itself maintains item identity internally). For v1
|
|
21
|
+
* we accept the ambiguity; the CRDT semantics still converge.
|
|
22
|
+
*/
|
|
23
|
+
export function computeDelta(before: string, after: string): TextDelta | null {
|
|
24
|
+
if (before === after) return null
|
|
25
|
+
|
|
26
|
+
let prefix = 0
|
|
27
|
+
const minLen = Math.min(before.length, after.length)
|
|
28
|
+
while (prefix < minLen && before[prefix] === after[prefix]) prefix++
|
|
29
|
+
|
|
30
|
+
// Walk back from each end, capped so suffix can't overlap the prefix
|
|
31
|
+
// on either side. Without the cap, identical strings of repeated
|
|
32
|
+
// chars (e.g. 'aaa' → 'aa') would consume the same byte from both
|
|
33
|
+
// directions and produce an empty middle on both sides.
|
|
34
|
+
let suffix = 0
|
|
35
|
+
const maxSuffix = Math.min(before.length - prefix, after.length - prefix)
|
|
36
|
+
while (
|
|
37
|
+
suffix < maxSuffix &&
|
|
38
|
+
before[before.length - 1 - suffix] === after[after.length - 1 - suffix]
|
|
39
|
+
) {
|
|
40
|
+
suffix++
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const beforeMid = before.slice(prefix, before.length - suffix)
|
|
44
|
+
const afterMid = after.slice(prefix, after.length - suffix)
|
|
45
|
+
|
|
46
|
+
if (beforeMid.length === 0 && afterMid.length > 0) {
|
|
47
|
+
return { kind: 'insert', index: prefix, text: afterMid }
|
|
48
|
+
}
|
|
49
|
+
if (afterMid.length === 0 && beforeMid.length > 0) {
|
|
50
|
+
return { kind: 'delete', index: prefix, length: beforeMid.length }
|
|
51
|
+
}
|
|
52
|
+
return { kind: 'replace', from: prefix, to: prefix + beforeMid.length, text: afterMid }
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
/**
|
|
56
|
+
* Phase F.6 — best-effort cursor anchor across a remote-applied edit.
|
|
57
|
+
*
|
|
58
|
+
* - Edit landed AFTER cursor (cursor inside the common prefix) → keep
|
|
59
|
+
* cursor where it is.
|
|
60
|
+
* - Edit landed BEFORE cursor → shift
|
|
61
|
+
* cursor by `after.length − before.length` so its character-offset
|
|
62
|
+
* into the post-edit string matches its pre-edit anchor.
|
|
63
|
+
* - Edit landed OVERLAPPING the cursor → cursor
|
|
64
|
+
* ends up at the boundary between the changed region and the
|
|
65
|
+
* unchanged suffix (which `Math.max(0, cursor + delta)` produces
|
|
66
|
+
* naturally and clamps to the new bounds).
|
|
67
|
+
*
|
|
68
|
+
* This is a heuristic, not a Yjs `RelativePosition`. Two peers typing
|
|
69
|
+
* at the exact same insertion point can still see a one-character cursor
|
|
70
|
+
* twitch on the remote-mirror side; v2 (in-input remote carets) would
|
|
71
|
+
* upgrade to relative positions if/when a consumer asks. Native input
|
|
72
|
+
* cursors are clamped to `[0, after.length]` by every browser, so this
|
|
73
|
+
* function does the same to avoid `setSelectionRange` throwing.
|
|
74
|
+
*/
|
|
75
|
+
export function preserveCursor(before: string, after: string, cursor: number): number {
|
|
76
|
+
if (before === after) return cursor
|
|
77
|
+
|
|
78
|
+
let prefix = 0
|
|
79
|
+
const minLen = Math.min(before.length, after.length)
|
|
80
|
+
while (prefix < minLen && before[prefix] === after[prefix]) prefix++
|
|
81
|
+
|
|
82
|
+
if (cursor <= prefix) return Math.min(cursor, after.length)
|
|
83
|
+
|
|
84
|
+
const delta = after.length - before.length
|
|
85
|
+
return Math.max(0, Math.min(after.length, cursor + delta))
|
|
86
|
+
}
|
package/src/react/index.ts
CHANGED
|
@@ -49,6 +49,8 @@ export {
|
|
|
49
49
|
type FormCollabBinding,
|
|
50
50
|
type FormCollabBindingFactory,
|
|
51
51
|
type FormCollabBindingFactoryArgs,
|
|
52
|
+
type TextBinding,
|
|
53
|
+
type TextDelta,
|
|
52
54
|
} from './FormCollabBindingRegistry.js'
|
|
53
55
|
export {
|
|
54
56
|
registerFieldPresenceComponent,
|
|
@@ -70,7 +72,13 @@ export {
|
|
|
70
72
|
RecordWrapperGate,
|
|
71
73
|
type RecordWrapperGateProps,
|
|
72
74
|
} from './RecordWrapperGate.js'
|
|
73
|
-
export {
|
|
75
|
+
export {
|
|
76
|
+
parseRecordPageUrl,
|
|
77
|
+
parseRecordEditUrl,
|
|
78
|
+
type RecordPageIdentity,
|
|
79
|
+
type RecordPageRole,
|
|
80
|
+
type RecordEditIdentity,
|
|
81
|
+
} from './parseRecordEditUrl.js'
|
|
74
82
|
export {
|
|
75
83
|
registerWidgetRenderer,
|
|
76
84
|
getWidgetRenderer,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { test } from 'node:test'
|
|
2
2
|
import assert from 'node:assert/strict'
|
|
3
|
-
import { parseRecordEditUrl } from './parseRecordEditUrl.js'
|
|
3
|
+
import { parseRecordEditUrl, parseRecordPageUrl } from './parseRecordEditUrl.js'
|
|
4
4
|
|
|
5
5
|
test('parseRecordEditUrl: bare resource edit', () => {
|
|
6
6
|
assert.deepEqual(
|
|
@@ -73,3 +73,50 @@ test('parseRecordEditUrl: slug-only edit (no record id) returns null', () => {
|
|
|
73
73
|
// slice. Defensive: reject when slugParts is empty.
|
|
74
74
|
assert.equal(parseRecordEditUrl('/admin/edit', '/admin'), null)
|
|
75
75
|
})
|
|
76
|
+
|
|
77
|
+
// ─── parseRecordPageUrl (role-aware) ─────────────────────────
|
|
78
|
+
|
|
79
|
+
test('parseRecordPageUrl: edit URL returns role=edit', () => {
|
|
80
|
+
assert.deepEqual(
|
|
81
|
+
parseRecordPageUrl('/admin/articles/123/edit', '/admin'),
|
|
82
|
+
{ resourceSlug: 'articles', recordId: '123', role: 'edit' },
|
|
83
|
+
)
|
|
84
|
+
})
|
|
85
|
+
|
|
86
|
+
test('parseRecordPageUrl: view URL returns role=view', () => {
|
|
87
|
+
assert.deepEqual(
|
|
88
|
+
parseRecordPageUrl('/admin/articles/123/view', '/admin'),
|
|
89
|
+
{ resourceSlug: 'articles', recordId: '123', role: 'view' },
|
|
90
|
+
)
|
|
91
|
+
})
|
|
92
|
+
|
|
93
|
+
test('parseRecordPageUrl: cluster-prefixed view URL', () => {
|
|
94
|
+
assert.deepEqual(
|
|
95
|
+
parseRecordPageUrl('/admin/blog/articles/123/view', '/admin'),
|
|
96
|
+
{ resourceSlug: 'blog/articles', recordId: '123', role: 'view' },
|
|
97
|
+
)
|
|
98
|
+
})
|
|
99
|
+
|
|
100
|
+
test('parseRecordPageUrl: terminal token other than edit|view returns null', () => {
|
|
101
|
+
// 'delete' / 'restore' / 'force-delete' are POST handlers, not pages.
|
|
102
|
+
assert.equal(parseRecordPageUrl('/admin/articles/123/delete', '/admin'), null)
|
|
103
|
+
assert.equal(parseRecordPageUrl('/admin/articles/123/restore', '/admin'), null)
|
|
104
|
+
// Custom record sub-pages also fall through here — they have their own
|
|
105
|
+
// gate path (not record-bound for collab purposes in v1).
|
|
106
|
+
assert.equal(parseRecordPageUrl('/admin/articles/123/history', '/admin'), null)
|
|
107
|
+
})
|
|
108
|
+
|
|
109
|
+
test('parseRecordPageUrl: view URL in nested-relation form', () => {
|
|
110
|
+
assert.deepEqual(
|
|
111
|
+
parseRecordPageUrl('/admin/articles/123/comments/456/view', '/admin'),
|
|
112
|
+
{ resourceSlug: 'articles/123/comments', recordId: '456', role: 'view' },
|
|
113
|
+
)
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
// ─── Legacy alias: parseRecordEditUrl filters view URLs ──────
|
|
117
|
+
|
|
118
|
+
test('parseRecordEditUrl: view URL returns null (back-compat: edit-only)', () => {
|
|
119
|
+
// A consumer still calling the legacy `parseRecordEditUrl` should
|
|
120
|
+
// continue to see view URLs filtered out — only edit URLs round-trip.
|
|
121
|
+
assert.equal(parseRecordEditUrl('/admin/articles/123/view', '/admin'), null)
|
|
122
|
+
})
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
2
|
+
* URL → record-page identity parser. Used by `RecordWrapperGate` (and any
|
|
3
|
+
* plugin that wants to reason about record-bound URLs) to decide whether
|
|
4
|
+
* the current page is a record-edit or record-view route.
|
|
4
5
|
*
|
|
5
6
|
* A URL matches when:
|
|
6
7
|
* 1. it starts with the panel's `basePath`
|
|
7
|
-
* 2. after stripping the prefix it ends with `/edit`
|
|
8
|
+
* 2. after stripping the prefix it ends with `/edit` or `/view`
|
|
8
9
|
* 3. there are at least three remaining segments (resource slug,
|
|
9
|
-
* record id,
|
|
10
|
+
* record id, terminal token)
|
|
10
11
|
*
|
|
11
12
|
* The `resourceSlug` is the slash-joined chain of every segment up to
|
|
12
13
|
* the record id — this gives clustered resources (`${base}/blog/articles/123/edit`)
|
|
@@ -14,22 +15,40 @@
|
|
|
14
15
|
* distinct slugs so two URLs that target different records always
|
|
15
16
|
* produce different room names downstream.
|
|
16
17
|
*
|
|
17
|
-
* `/admin/articles/123/edit` → {
|
|
18
|
-
* `/admin/
|
|
19
|
-
* `/admin/articles/123/
|
|
20
|
-
* `/admin/articles/123/comments`
|
|
21
|
-
* `/admin/articles/123/comments
|
|
18
|
+
* `/admin/articles/123/edit` → { slug: 'articles', id: '123', role: 'edit' }
|
|
19
|
+
* `/admin/articles/123/view` → { slug: 'articles', id: '123', role: 'view' }
|
|
20
|
+
* `/admin/blog/articles/123/edit` → { slug: 'blog/articles', id: '123', role: 'edit' }
|
|
21
|
+
* `/admin/articles/123/comments/456/edit` → { slug: 'articles/123/comments', id: '456', role: 'edit' }
|
|
22
|
+
* `/admin/articles/123/comments` → null (no trailing /edit or /view)
|
|
23
|
+
* `/admin/articles/123/comments/create` → null (terminal token isn't edit|view)
|
|
22
24
|
* `/site/articles/123/edit` → null (basePath mismatch when basePath='/admin')
|
|
23
25
|
*/
|
|
24
|
-
|
|
26
|
+
|
|
27
|
+
/** Page roles `parseRecordPageUrl` recognizes. `'edit'` and `'view'`
|
|
28
|
+
* are the two record-scoped page roles where collab and other
|
|
29
|
+
* record-bound plugins want to mount their per-record wrapper. */
|
|
30
|
+
export type RecordPageRole = 'edit' | 'view'
|
|
31
|
+
|
|
32
|
+
export interface RecordPageIdentity {
|
|
25
33
|
resourceSlug: string
|
|
26
34
|
recordId: string
|
|
35
|
+
/** Which terminal URL segment matched — `'edit'` for the writable edit
|
|
36
|
+
* page, `'view'` for the read-only view page. Lets the gate decide per
|
|
37
|
+
* resource whether collab activates on this role (defaults to `'edit'`
|
|
38
|
+
* only; resources opt into `'view'` for presence-only experiences). */
|
|
39
|
+
role: RecordPageRole
|
|
27
40
|
}
|
|
28
41
|
|
|
29
|
-
|
|
42
|
+
const RECOGNIZED_ROLES: ReadonlyArray<RecordPageRole> = ['edit', 'view']
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Parse a pilotiq URL into a `{ slug, id, role }` identity. Returns
|
|
46
|
+
* `null` for any URL that isn't a record-edit or record-view page.
|
|
47
|
+
*/
|
|
48
|
+
export function parseRecordPageUrl(
|
|
30
49
|
currentPath: string,
|
|
31
50
|
basePath: string,
|
|
32
|
-
):
|
|
51
|
+
): RecordPageIdentity | null {
|
|
33
52
|
if (!currentPath) return null
|
|
34
53
|
// Normalise — trailing slashes on the URL or trailing slashes on
|
|
35
54
|
// basePath would otherwise reject perfectly valid matches.
|
|
@@ -42,7 +61,8 @@ export function parseRecordEditUrl(
|
|
|
42
61
|
const parts = tail.split('/').filter(Boolean)
|
|
43
62
|
|
|
44
63
|
if (parts.length < 3) return null
|
|
45
|
-
|
|
64
|
+
const terminal = parts[parts.length - 1]!
|
|
65
|
+
if (!RECOGNIZED_ROLES.includes(terminal as RecordPageRole)) return null
|
|
46
66
|
|
|
47
67
|
const recordId = parts[parts.length - 2]!
|
|
48
68
|
const slugParts = parts.slice(0, parts.length - 2)
|
|
@@ -51,5 +71,24 @@ export function parseRecordEditUrl(
|
|
|
51
71
|
return {
|
|
52
72
|
resourceSlug: slugParts.join('/'),
|
|
53
73
|
recordId,
|
|
74
|
+
role: terminal as RecordPageRole,
|
|
54
75
|
}
|
|
55
76
|
}
|
|
77
|
+
|
|
78
|
+
/** Legacy alias: parse a URL into an edit-only identity. Returns `null`
|
|
79
|
+
* for view URLs (and any non-edit URL). Kept for back-compat with the
|
|
80
|
+
* pre-`parseRecordPageUrl` public API; new code should call
|
|
81
|
+
* `parseRecordPageUrl` and branch on `role`. */
|
|
82
|
+
export interface RecordEditIdentity {
|
|
83
|
+
resourceSlug: string
|
|
84
|
+
recordId: string
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
export function parseRecordEditUrl(
|
|
88
|
+
currentPath: string,
|
|
89
|
+
basePath: string,
|
|
90
|
+
): RecordEditIdentity | null {
|
|
91
|
+
const identity = parseRecordPageUrl(currentPath, basePath)
|
|
92
|
+
if (!identity || identity.role !== 'edit') return null
|
|
93
|
+
return { resourceSlug: identity.resourceSlug, recordId: identity.recordId }
|
|
94
|
+
}
|