@wordpress/core-data 7.45.0 → 7.45.1-next.v.202605131032.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/build/actions.cjs +8 -6
- package/build/actions.cjs.map +2 -2
- package/build/awareness/post-editor-awareness.cjs +1 -1
- package/build/awareness/post-editor-awareness.cjs.map +2 -2
- package/build/resolvers.cjs +2 -1
- package/build/resolvers.cjs.map +2 -2
- package/build/types.cjs.map +2 -2
- package/build/utils/block-selection-history.cjs +4 -1
- package/build/utils/block-selection-history.cjs.map +2 -2
- package/build/utils/crdt-blocks.cjs +157 -89
- package/build/utils/crdt-blocks.cjs.map +2 -2
- package/build/utils/crdt-selection.cjs +1 -1
- package/build/utils/crdt-selection.cjs.map +2 -2
- package/build/utils/crdt-user-selections.cjs +4 -1
- package/build/utils/crdt-user-selections.cjs.map +2 -2
- package/build/utils/crdt-utils.cjs +18 -6
- package/build/utils/crdt-utils.cjs.map +2 -2
- package/build/utils/crdt.cjs +12 -2
- package/build/utils/crdt.cjs.map +2 -2
- package/build-module/actions.mjs +8 -6
- package/build-module/actions.mjs.map +2 -2
- package/build-module/awareness/post-editor-awareness.mjs +5 -2
- package/build-module/awareness/post-editor-awareness.mjs.map +2 -2
- package/build-module/resolvers.mjs +2 -1
- package/build-module/resolvers.mjs.map +2 -2
- package/build-module/types.mjs.map +2 -2
- package/build-module/utils/block-selection-history.mjs +5 -1
- package/build-module/utils/block-selection-history.mjs.map +2 -2
- package/build-module/utils/crdt-blocks.mjs +162 -90
- package/build-module/utils/crdt-blocks.mjs.map +2 -2
- package/build-module/utils/crdt-selection.mjs +2 -1
- package/build-module/utils/crdt-selection.mjs.map +2 -2
- package/build-module/utils/crdt-user-selections.mjs +9 -2
- package/build-module/utils/crdt-user-selections.mjs.map +2 -2
- package/build-module/utils/crdt-utils.mjs +16 -6
- package/build-module/utils/crdt-utils.mjs.map +2 -2
- package/build-module/utils/crdt.mjs +13 -2
- package/build-module/utils/crdt.mjs.map +2 -2
- package/build-types/actions.d.ts +177 -64
- package/build-types/actions.d.ts.map +1 -1
- package/build-types/awareness/awareness-state.d.ts.map +1 -1
- package/build-types/awareness/base-awareness.d.ts +0 -3
- package/build-types/awareness/base-awareness.d.ts.map +1 -1
- package/build-types/awareness/post-editor-awareness.d.ts +1 -8
- package/build-types/awareness/post-editor-awareness.d.ts.map +1 -1
- package/build-types/awareness/typed-awareness.d.ts.map +1 -1
- package/build-types/batch/create-batch.d.ts +1 -1
- package/build-types/batch/create-batch.d.ts.map +1 -1
- package/build-types/batch/default-processor.d.ts.map +1 -1
- package/build-types/batch/index.d.ts +2 -2
- package/build-types/batch/index.d.ts.map +1 -1
- package/build-types/entities.d.ts +114 -87
- package/build-types/entities.d.ts.map +1 -1
- package/build-types/entity-context.d.ts +1 -1
- package/build-types/entity-context.d.ts.map +1 -1
- package/build-types/entity-provider.d.ts +2 -2
- package/build-types/entity-provider.d.ts.map +1 -1
- package/build-types/entity-types/attachment.d.ts.map +1 -1
- package/build-types/entity-types/base-entity-records.d.ts.map +1 -1
- package/build-types/entity-types/base.d.ts.map +1 -1
- package/build-types/entity-types/comment.d.ts.map +1 -1
- package/build-types/entity-types/font-collection.d.ts.map +1 -1
- package/build-types/entity-types/font-family.d.ts.map +1 -1
- package/build-types/entity-types/global-styles-revision.d.ts.map +1 -1
- package/build-types/entity-types/icon.d.ts.map +1 -1
- package/build-types/entity-types/menu-location.d.ts.map +1 -1
- package/build-types/entity-types/nav-menu-item.d.ts.map +1 -1
- package/build-types/entity-types/nav-menu.d.ts.map +1 -1
- package/build-types/entity-types/page.d.ts.map +1 -1
- package/build-types/entity-types/plugin.d.ts.map +1 -1
- package/build-types/entity-types/post-revision.d.ts.map +1 -1
- package/build-types/entity-types/post-status.d.ts.map +1 -1
- package/build-types/entity-types/post.d.ts.map +1 -1
- package/build-types/entity-types/settings.d.ts.map +1 -1
- package/build-types/entity-types/sidebar.d.ts.map +1 -1
- package/build-types/entity-types/taxonomy.d.ts.map +1 -1
- package/build-types/entity-types/term.d.ts.map +1 -1
- package/build-types/entity-types/theme.d.ts.map +1 -1
- package/build-types/entity-types/type.d.ts.map +1 -1
- package/build-types/entity-types/user.d.ts.map +1 -1
- package/build-types/entity-types/widget-type.d.ts.map +1 -1
- package/build-types/entity-types/widget.d.ts.map +1 -1
- package/build-types/entity-types/wp-template-part.d.ts.map +1 -1
- package/build-types/entity-types/wp-template.d.ts.map +1 -1
- package/build-types/fetch/__experimental-fetch-url-data.d.ts +2 -5
- package/build-types/fetch/__experimental-fetch-url-data.d.ts.map +1 -1
- package/build-types/fetch/index.d.ts +3 -3
- package/build-types/fetch/index.d.ts.map +1 -1
- package/build-types/footnotes/get-footnotes-order.d.ts.map +1 -1
- package/build-types/footnotes/get-rich-text-values-cached.d.ts.map +1 -1
- package/build-types/footnotes/index.d.ts +1 -1
- package/build-types/footnotes/index.d.ts.map +1 -1
- package/build-types/hooks/use-entity-block-editor.d.ts +1 -1
- package/build-types/hooks/use-entity-block-editor.d.ts.map +1 -1
- package/build-types/hooks/use-entity-id.d.ts.map +1 -1
- package/build-types/hooks/use-entity-prop.d.ts.map +1 -1
- package/build-types/hooks/use-resource-permissions.d.ts.map +1 -1
- package/build-types/index.d.ts +155 -153
- package/build-types/index.d.ts.map +1 -1
- package/build-types/locks/actions.d.ts +1 -1
- package/build-types/locks/actions.d.ts.map +1 -1
- package/build-types/locks/engine.d.ts +1 -1
- package/build-types/locks/engine.d.ts.map +1 -1
- package/build-types/locks/reducer.d.ts.map +1 -1
- package/build-types/locks/selectors.d.ts +2 -2
- package/build-types/locks/selectors.d.ts.map +1 -1
- package/build-types/locks/utils.d.ts +5 -5
- package/build-types/locks/utils.d.ts.map +1 -1
- package/build-types/name.d.ts +1 -1
- package/build-types/name.d.ts.map +1 -1
- package/build-types/private-actions.d.ts +45 -29
- package/build-types/private-actions.d.ts.map +1 -1
- package/build-types/private-apis.d.ts +1 -1
- package/build-types/private-apis.d.ts.map +1 -1
- package/build-types/queried-data/actions.d.ts +3 -3
- package/build-types/queried-data/actions.d.ts.map +1 -1
- package/build-types/queried-data/get-query-parts.d.ts +10 -34
- package/build-types/queried-data/get-query-parts.d.ts.map +1 -1
- package/build-types/queried-data/index.d.ts +3 -3
- package/build-types/queried-data/index.d.ts.map +1 -1
- package/build-types/queried-data/reducer.d.ts +7 -23
- package/build-types/queried-data/reducer.d.ts.map +1 -1
- package/build-types/queried-data/selectors.d.ts +3 -3
- package/build-types/queried-data/selectors.d.ts.map +1 -1
- package/build-types/reducer.d.ts +40 -32
- package/build-types/reducer.d.ts.map +1 -1
- package/build-types/resolvers.d.ts +130 -47
- package/build-types/resolvers.d.ts.map +1 -1
- package/build-types/selectors.d.ts +1 -1
- package/build-types/selectors.d.ts.map +1 -1
- package/build-types/types.d.ts +61 -6
- package/build-types/types.d.ts.map +1 -1
- package/build-types/utils/block-selection-history.d.ts.map +1 -1
- package/build-types/utils/conservative-map-item.d.ts.map +1 -1
- package/build-types/utils/crdt-blocks.d.ts +19 -9
- package/build-types/utils/crdt-blocks.d.ts.map +1 -1
- package/build-types/utils/crdt-selection.d.ts.map +1 -1
- package/build-types/utils/crdt-user-selections.d.ts.map +1 -1
- package/build-types/utils/crdt-utils.d.ts +35 -2
- package/build-types/utils/crdt-utils.d.ts.map +1 -1
- package/build-types/utils/crdt.d.ts.map +1 -1
- package/build-types/utils/forward-resolver.d.ts +2 -2
- package/build-types/utils/forward-resolver.d.ts.map +1 -1
- package/build-types/utils/get-nested-value.d.ts.map +1 -1
- package/build-types/utils/get-normalized-comma-separable.d.ts +1 -1
- package/build-types/utils/get-normalized-comma-separable.d.ts.map +1 -1
- package/build-types/utils/if-matching-action.d.ts +3 -3
- package/build-types/utils/if-matching-action.d.ts.map +1 -1
- package/build-types/utils/index.d.ts +12 -12
- package/build-types/utils/index.d.ts.map +1 -1
- package/build-types/utils/is-numeric-id.d.ts.map +1 -1
- package/build-types/utils/log-entity-deprecation.d.ts +1 -1
- package/build-types/utils/log-entity-deprecation.d.ts.map +1 -1
- package/build-types/utils/normalize-query-for-resolution.d.ts.map +1 -1
- package/build-types/utils/receive-intermediate-results.d.ts +1 -1
- package/build-types/utils/receive-intermediate-results.d.ts.map +1 -1
- package/build-types/utils/replace-action.d.ts +3 -3
- package/build-types/utils/replace-action.d.ts.map +1 -1
- package/build-types/utils/set-nested-value.d.ts.map +1 -1
- package/build-types/utils/user-permissions.d.ts +3 -3
- package/build-types/utils/user-permissions.d.ts.map +1 -1
- package/build-types/utils/with-weak-map-cache.d.ts +1 -1
- package/build-types/utils/with-weak-map-cache.d.ts.map +1 -1
- package/package.json +20 -20
- package/src/actions.js +7 -9
- package/src/awareness/post-editor-awareness.ts +5 -2
- package/src/resolvers.js +2 -1
- package/src/test/actions.js +58 -0
- package/src/test/resolvers.js +115 -2
- package/src/test/rtc-rich-text-offset-space.test.js +204 -0
- package/src/types.ts +63 -6
- package/src/utils/block-selection-history.ts +5 -1
- package/src/utils/crdt-blocks.ts +316 -116
- package/src/utils/crdt-selection.ts +2 -1
- package/src/utils/crdt-user-selections.ts +9 -2
- package/src/utils/crdt-utils.ts +53 -10
- package/src/utils/crdt.ts +30 -4
- package/src/utils/test/crdt-blocks.ts +74 -18
- package/src/utils/test/crdt-utils.ts +18 -2
- package/src/utils/test/rtc-rich-text-cursor-scope.test.js +267 -0
- package/src/utils/test/rtc-rich-text-offset-space.test.js +469 -0
|
@@ -4,7 +4,11 @@ import fastDeepEqual from "fast-deep-equal/es6/index.js";
|
|
|
4
4
|
import { getBlockTypes } from "@wordpress/blocks";
|
|
5
5
|
import { RichTextData } from "@wordpress/rich-text";
|
|
6
6
|
import { Y } from "@wordpress/sync";
|
|
7
|
-
import {
|
|
7
|
+
import {
|
|
8
|
+
asRichTextOffset,
|
|
9
|
+
createYMap,
|
|
10
|
+
richTextOffsetToHtmlIndex
|
|
11
|
+
} from "./crdt-utils.mjs";
|
|
8
12
|
import { getCachedRichTextData } from "./crdt-text.mjs";
|
|
9
13
|
import { Delta } from "../sync.mjs";
|
|
10
14
|
var serializableBlocksCache = /* @__PURE__ */ new WeakMap();
|
|
@@ -37,8 +41,19 @@ function makeBlockAttributesSerializable(blockName, attributes) {
|
|
|
37
41
|
}
|
|
38
42
|
function makeBlocksSerializable(blocks) {
|
|
39
43
|
return blocks.map((block) => {
|
|
40
|
-
const {
|
|
41
|
-
|
|
44
|
+
const {
|
|
45
|
+
name,
|
|
46
|
+
innerBlocks,
|
|
47
|
+
attributes,
|
|
48
|
+
/*
|
|
49
|
+
* Any validation issues discovered when loading a block are appended
|
|
50
|
+
* to the block node with a logging function, which cannot be serialized.
|
|
51
|
+
*
|
|
52
|
+
* @see import("@wordpress/blocks/src/api/parser").parseRawBlock()
|
|
53
|
+
*/
|
|
54
|
+
validationIssues,
|
|
55
|
+
...rest
|
|
56
|
+
} = block;
|
|
42
57
|
return {
|
|
43
58
|
...rest,
|
|
44
59
|
name,
|
|
@@ -194,111 +209,138 @@ function createNewYBlock(block) {
|
|
|
194
209
|
)
|
|
195
210
|
);
|
|
196
211
|
}
|
|
197
|
-
function mergeCrdtBlocks(yblocks, incomingBlocks,
|
|
212
|
+
function mergeCrdtBlocks(yblocks, incomingBlocks, attributeCursor) {
|
|
198
213
|
if (!serializableBlocksCache.has(incomingBlocks)) {
|
|
199
214
|
serializableBlocksCache.set(
|
|
200
215
|
incomingBlocks,
|
|
201
216
|
makeBlocksSerializable(incomingBlocks)
|
|
202
217
|
);
|
|
203
218
|
}
|
|
204
|
-
const
|
|
219
|
+
const incomingBlocksToSync = serializableBlocksCache.get(incomingBlocks) ?? [];
|
|
205
220
|
const numOfCommonEntries = Math.min(
|
|
206
|
-
|
|
221
|
+
incomingBlocksToSync.length ?? 0,
|
|
207
222
|
yblocks.length
|
|
208
223
|
);
|
|
209
224
|
let left = 0;
|
|
210
225
|
let right = 0;
|
|
211
|
-
for (; left < numOfCommonEntries && areBlocksEqual(
|
|
226
|
+
for (; left < numOfCommonEntries && areBlocksEqual(incomingBlocksToSync[left], yblocks.get(left)); left++) {
|
|
212
227
|
}
|
|
213
228
|
for (; right < numOfCommonEntries - left && areBlocksEqual(
|
|
214
|
-
|
|
229
|
+
incomingBlocksToSync[incomingBlocksToSync.length - right - 1],
|
|
215
230
|
yblocks.get(yblocks.length - right - 1)
|
|
216
231
|
); right++) {
|
|
217
232
|
}
|
|
218
233
|
const numOfUpdatesNeeded = numOfCommonEntries - left - right;
|
|
219
234
|
const numOfInsertionsNeeded = Math.max(
|
|
220
235
|
0,
|
|
221
|
-
|
|
236
|
+
incomingBlocksToSync.length - yblocks.length
|
|
222
237
|
);
|
|
223
238
|
const numOfDeletionsNeeded = Math.max(
|
|
224
239
|
0,
|
|
225
|
-
yblocks.length -
|
|
240
|
+
yblocks.length - incomingBlocksToSync.length
|
|
226
241
|
);
|
|
227
242
|
for (let i = 0; i < numOfUpdatesNeeded; i++, left++) {
|
|
228
|
-
const
|
|
229
|
-
const
|
|
230
|
-
Object.entries(
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
key,
|
|
237
|
-
createNewYAttributeMap(block.name, value)
|
|
243
|
+
const incomingYBlock = incomingBlocksToSync[left];
|
|
244
|
+
const localYBlock = yblocks.get(left);
|
|
245
|
+
Object.entries(incomingYBlock).forEach(
|
|
246
|
+
([incomingBlockProperty, incomingBlockPropertyValue]) => {
|
|
247
|
+
switch (incomingBlockProperty) {
|
|
248
|
+
case "attributes": {
|
|
249
|
+
const localAttributes = localYBlock.get(
|
|
250
|
+
incomingBlockProperty
|
|
238
251
|
);
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
currentAttribute
|
|
248
|
-
);
|
|
249
|
-
const isYType = currentAttribute instanceof Y.AbstractType;
|
|
250
|
-
const isAttributeChanged = !isExpectedType || isYType || !fastDeepEqual(
|
|
251
|
-
currentAttribute,
|
|
252
|
-
attributeValue
|
|
252
|
+
const incomingAttributes = incomingBlockPropertyValue;
|
|
253
|
+
if (!localAttributes) {
|
|
254
|
+
localYBlock.set(
|
|
255
|
+
incomingBlockProperty,
|
|
256
|
+
createNewYAttributeMap(
|
|
257
|
+
incomingYBlock.name,
|
|
258
|
+
incomingAttributes
|
|
259
|
+
)
|
|
253
260
|
);
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
+
break;
|
|
262
|
+
}
|
|
263
|
+
Object.entries(incomingAttributes).forEach(
|
|
264
|
+
([
|
|
265
|
+
incomingAttributeName,
|
|
266
|
+
incomingAttributeValue
|
|
267
|
+
]) => {
|
|
268
|
+
const currentAttribute = localAttributes?.get(
|
|
269
|
+
incomingAttributeName
|
|
270
|
+
);
|
|
271
|
+
const isExpectedType = isExpectedAttributeType(
|
|
272
|
+
incomingYBlock.name,
|
|
273
|
+
incomingAttributeName,
|
|
274
|
+
currentAttribute
|
|
261
275
|
);
|
|
276
|
+
const isYType = currentAttribute instanceof Y.AbstractType;
|
|
277
|
+
const isAttributeChanged = !isExpectedType || isYType || !fastDeepEqual(
|
|
278
|
+
currentAttribute,
|
|
279
|
+
incomingAttributeValue
|
|
280
|
+
);
|
|
281
|
+
if (isAttributeChanged) {
|
|
282
|
+
updateYBlockAttribute(
|
|
283
|
+
incomingYBlock.name,
|
|
284
|
+
incomingYBlock.clientId,
|
|
285
|
+
incomingAttributeName,
|
|
286
|
+
incomingAttributeValue,
|
|
287
|
+
localAttributes,
|
|
288
|
+
attributeCursor
|
|
289
|
+
);
|
|
290
|
+
}
|
|
262
291
|
}
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
292
|
+
);
|
|
293
|
+
localAttributes.forEach(
|
|
294
|
+
(_attrValue, attrName) => {
|
|
295
|
+
if (!incomingBlockPropertyValue.hasOwnProperty(
|
|
296
|
+
attrName
|
|
297
|
+
)) {
|
|
298
|
+
localAttributes.delete(attrName);
|
|
299
|
+
}
|
|
269
300
|
}
|
|
301
|
+
);
|
|
302
|
+
break;
|
|
303
|
+
}
|
|
304
|
+
case "innerBlocks": {
|
|
305
|
+
let yInnerBlocks = localYBlock.get(
|
|
306
|
+
incomingBlockProperty
|
|
307
|
+
);
|
|
308
|
+
if (!(yInnerBlocks instanceof Y.Array)) {
|
|
309
|
+
yInnerBlocks = new Y.Array();
|
|
310
|
+
localYBlock.set(
|
|
311
|
+
incomingBlockProperty,
|
|
312
|
+
yInnerBlocks
|
|
313
|
+
);
|
|
270
314
|
}
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
yInnerBlocks = new Y.Array();
|
|
278
|
-
yblock.set(key, yInnerBlocks);
|
|
315
|
+
mergeCrdtBlocks(
|
|
316
|
+
yInnerBlocks,
|
|
317
|
+
incomingBlockPropertyValue ?? [],
|
|
318
|
+
attributeCursor
|
|
319
|
+
);
|
|
320
|
+
break;
|
|
279
321
|
}
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
322
|
+
default:
|
|
323
|
+
if (!fastDeepEqual(
|
|
324
|
+
incomingYBlock[incomingBlockProperty],
|
|
325
|
+
localYBlock.get(incomingBlockProperty)
|
|
326
|
+
)) {
|
|
327
|
+
localYBlock.set(
|
|
328
|
+
incomingBlockProperty,
|
|
329
|
+
incomingBlockPropertyValue
|
|
330
|
+
);
|
|
331
|
+
}
|
|
286
332
|
}
|
|
287
|
-
default:
|
|
288
|
-
if (!fastDeepEqual(block[key], yblock.get(key))) {
|
|
289
|
-
yblock.set(key, value);
|
|
290
|
-
}
|
|
291
333
|
}
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
if (!
|
|
295
|
-
|
|
334
|
+
);
|
|
335
|
+
localYBlock.forEach((_v, k) => {
|
|
336
|
+
if (!incomingYBlock.hasOwnProperty(k)) {
|
|
337
|
+
localYBlock.delete(k);
|
|
296
338
|
}
|
|
297
339
|
});
|
|
298
340
|
}
|
|
299
341
|
yblocks.delete(left, numOfDeletionsNeeded);
|
|
300
342
|
for (let i = 0; i < numOfInsertionsNeeded; i++, left++) {
|
|
301
|
-
const newBlock = [createNewYBlock(
|
|
343
|
+
const newBlock = [createNewYBlock(incomingBlocksToSync[left])];
|
|
302
344
|
yblocks.insert(left, newBlock);
|
|
303
345
|
}
|
|
304
346
|
const knownClientIds = /* @__PURE__ */ new Set();
|
|
@@ -321,7 +363,7 @@ function areArrayElementsEqual(newElement, yElement) {
|
|
|
321
363
|
}
|
|
322
364
|
return fastDeepEqual(newElement, yElement);
|
|
323
365
|
}
|
|
324
|
-
function mergeYArray(yArray, newValue, schema, cursorPosition) {
|
|
366
|
+
function mergeYArray(yArray, newValue, schema, cursorPosition, cursorScope) {
|
|
325
367
|
if (!schema.query) {
|
|
326
368
|
return;
|
|
327
369
|
}
|
|
@@ -345,7 +387,8 @@ function mergeYArray(yArray, newValue, schema, cursorPosition) {
|
|
|
345
387
|
currentElement,
|
|
346
388
|
newElement,
|
|
347
389
|
query,
|
|
348
|
-
cursorPosition
|
|
390
|
+
cursorPosition,
|
|
391
|
+
cursorScope
|
|
349
392
|
);
|
|
350
393
|
} else {
|
|
351
394
|
yArray.delete(0, yArray.length);
|
|
@@ -378,14 +421,24 @@ function mergeYArray(yArray, newValue, schema, cursorPosition) {
|
|
|
378
421
|
yArray.insert(insertAt, itemsToInsert);
|
|
379
422
|
}
|
|
380
423
|
}
|
|
381
|
-
function mergeYValue(schema, newVal, yMap, key, cursorPosition) {
|
|
424
|
+
function mergeYValue(schema, newVal, yMap, key, cursorPosition, cursorScope) {
|
|
382
425
|
const currentVal = yMap.get(key);
|
|
383
426
|
if (schema?.type === "rich-text" && typeof newVal === "string" && currentVal instanceof Y.Text) {
|
|
384
|
-
mergeRichTextUpdate(
|
|
427
|
+
mergeRichTextUpdate(
|
|
428
|
+
currentVal,
|
|
429
|
+
newVal,
|
|
430
|
+
resolveRichTextCursorPosition(cursorPosition, cursorScope, newVal)
|
|
431
|
+
);
|
|
385
432
|
} else if (schema?.type === "array" && schema.query && Array.isArray(newVal) && currentVal instanceof Y.Array) {
|
|
386
|
-
mergeYArray(currentVal, newVal, schema, cursorPosition);
|
|
433
|
+
mergeYArray(currentVal, newVal, schema, cursorPosition, cursorScope);
|
|
387
434
|
} else if (schema?.type === "object" && schema.query && isRecord(newVal) && currentVal instanceof Y.Map) {
|
|
388
|
-
mergeYMapValues(
|
|
435
|
+
mergeYMapValues(
|
|
436
|
+
currentVal,
|
|
437
|
+
newVal,
|
|
438
|
+
schema.query,
|
|
439
|
+
cursorPosition,
|
|
440
|
+
cursorScope
|
|
441
|
+
);
|
|
389
442
|
} else {
|
|
390
443
|
const newYValue = createYValueFromSchema(schema, newVal);
|
|
391
444
|
if (newYValue !== newVal || !fastDeepEqual(currentVal, newVal)) {
|
|
@@ -393,9 +446,16 @@ function mergeYValue(schema, newVal, yMap, key, cursorPosition) {
|
|
|
393
446
|
}
|
|
394
447
|
}
|
|
395
448
|
}
|
|
396
|
-
function mergeYMapValues(yMap, newObj, query, cursorPosition) {
|
|
449
|
+
function mergeYMapValues(yMap, newObj, query, cursorPosition, cursorScope) {
|
|
397
450
|
for (const [key, newVal] of Object.entries(newObj)) {
|
|
398
|
-
mergeYValue(
|
|
451
|
+
mergeYValue(
|
|
452
|
+
query[key],
|
|
453
|
+
newVal,
|
|
454
|
+
yMap,
|
|
455
|
+
key,
|
|
456
|
+
cursorPosition,
|
|
457
|
+
cursorScope
|
|
458
|
+
);
|
|
399
459
|
}
|
|
400
460
|
for (const key of yMap.keys()) {
|
|
401
461
|
if (!Object.hasOwn(newObj, key)) {
|
|
@@ -403,16 +463,23 @@ function mergeYMapValues(yMap, newObj, query, cursorPosition) {
|
|
|
403
463
|
}
|
|
404
464
|
}
|
|
405
465
|
}
|
|
406
|
-
function updateYBlockAttribute(blockName, attributeName, attributeValue, currentAttributes,
|
|
466
|
+
function updateYBlockAttribute(blockName, clientId, attributeName, attributeValue, currentAttributes, newCursorPosition) {
|
|
407
467
|
const schema = getBlockAttributeSchema(blockName, attributeName);
|
|
408
468
|
mergeYValue(
|
|
409
469
|
schema,
|
|
410
470
|
attributeValue,
|
|
411
471
|
currentAttributes,
|
|
412
472
|
attributeName,
|
|
413
|
-
|
|
473
|
+
newCursorPosition,
|
|
474
|
+
{ attributeKey: attributeName, clientId }
|
|
414
475
|
);
|
|
415
476
|
}
|
|
477
|
+
function resolveRichTextCursorPosition(cursorPosition, cursorScope, updatedValue) {
|
|
478
|
+
return cursorPosition && cursorPosition.clientId === cursorScope.clientId && cursorPosition.attributeKey === cursorScope.attributeKey && "number" === typeof cursorPosition.offset && Number.isInteger(cursorPosition.offset) ? richTextOffsetToHtmlIndex(
|
|
479
|
+
updatedValue,
|
|
480
|
+
asRichTextOffset(cursorPosition.offset)
|
|
481
|
+
) : null;
|
|
482
|
+
}
|
|
416
483
|
var cachedBlockAttributeSchemas;
|
|
417
484
|
function getBlockAttributeSchema(blockName, attributeName) {
|
|
418
485
|
if (!cachedBlockAttributeSchemas) {
|
|
@@ -453,20 +520,25 @@ function isLocalAttribute(blockName, attributeName) {
|
|
|
453
520
|
return "local" === getBlockAttributeSchema(blockName, attributeName)?.role;
|
|
454
521
|
}
|
|
455
522
|
var localDoc;
|
|
456
|
-
function mergeRichTextUpdate(blockYText, updatedValue,
|
|
457
|
-
if (!localDoc) {
|
|
458
|
-
localDoc = new Y.Doc();
|
|
459
|
-
}
|
|
460
|
-
const localYText = localDoc.getText("temporary-text");
|
|
461
|
-
localYText.delete(0, localYText.length);
|
|
462
|
-
localYText.insert(0, updatedValue);
|
|
523
|
+
function mergeRichTextUpdate(blockYText, updatedValue, htmlCursorIndex = null) {
|
|
463
524
|
const currentValueAsDelta = new Delta(blockYText.toDelta());
|
|
464
|
-
const updatedValueAsDelta = new Delta(
|
|
525
|
+
const updatedValueAsDelta = new Delta([{ insert: updatedValue }]);
|
|
465
526
|
const deltaDiff = currentValueAsDelta.diffWithCursor(
|
|
466
527
|
updatedValueAsDelta,
|
|
467
|
-
|
|
528
|
+
htmlCursorIndex
|
|
468
529
|
);
|
|
469
|
-
blockYText.
|
|
530
|
+
const safeDiff = htmlCursorIndex === null || isDeltaVerificationMatch(blockYText, deltaDiff, updatedValue) ? deltaDiff : currentValueAsDelta.diff(updatedValueAsDelta);
|
|
531
|
+
blockYText.applyDelta(safeDiff.ops);
|
|
532
|
+
}
|
|
533
|
+
function isDeltaVerificationMatch(blockYText, delta, expectedValue) {
|
|
534
|
+
if (!localDoc) {
|
|
535
|
+
localDoc = new Y.Doc();
|
|
536
|
+
}
|
|
537
|
+
const verificationYText = localDoc.getText("verification-text");
|
|
538
|
+
verificationYText.delete(0, verificationYText.length);
|
|
539
|
+
verificationYText.insert(0, blockYText.toString());
|
|
540
|
+
verificationYText.applyDelta(delta.ops);
|
|
541
|
+
return verificationYText.toString() === expectedValue;
|
|
470
542
|
}
|
|
471
543
|
export {
|
|
472
544
|
deserializeBlockAttributes,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/utils/crdt-blocks.ts"],
|
|
4
|
-
"sourcesContent": ["/**\n * External dependencies\n */\nimport { v4 as uuidv4 } from 'uuid';\nimport fastDeepEqual from 'fast-deep-equal/es6/index.js';\n\n/**\n * WordPress dependencies\n */\nimport { getBlockTypes } from '@wordpress/blocks';\nimport { RichTextData } from '@wordpress/rich-text';\nimport { Y } from '@wordpress/sync';\n\n/**\n * Internal dependencies\n */\nimport { createYMap, type YMapRecord, type YMapWrap } from './crdt-utils';\nimport { getCachedRichTextData } from './crdt-text';\nimport { Delta } from '../sync';\n\ninterface BlockAttributes {\n\t[ key: string ]: unknown;\n}\n\ninterface BlockAttributeSchema {\n\trole?: string;\n\ttype?: string;\n\tquery?: Record< string, BlockAttributeSchema >;\n}\n\ninterface BlockType {\n\tattributes?: Record< string, BlockAttributeSchema >;\n\tname: string;\n}\n\n// A block as represented in Gutenberg's data store.\nexport interface Block {\n\tattributes: BlockAttributes;\n\tclientId?: string;\n\tinnerBlocks: Block[];\n\tisValid?: boolean;\n\tname: string;\n\toriginalContent?: string;\n\tvalidationIssues?: string[]; // unserializable\n}\n\n// A block as represented in the CRDT document (Y.Map).\nexport interface YBlockRecord extends YMapRecord {\n\tattributes: YBlockAttributes;\n\tclientId: string;\n\tinnerBlocks: YBlocks;\n\tisValid?: boolean;\n\toriginalContent?: string;\n\tname: string;\n}\n\nexport type YBlock = YMapWrap< YBlockRecord >;\nexport type YBlocks = Y.Array< YBlock >;\n\n// Block attribute schema cannot be known at compile time, so we use Y.Map.\n// Attribute values will be typed as the union of `Y.Text` and `unknown`.\nexport type YBlockAttributes = Y.Map< Y.Text | unknown >;\n\nconst serializableBlocksCache = new WeakMap< WeakKey, Block[] >();\n\n/**\n * Recursively walk an attribute value and convert any RichTextData instances\n * to their string (HTML) representation. This is necessary for array-type and\n * object-type attributes, which can contain nested RichTextData.\n *\n * @param value The attribute value to serialize.\n * @return The value with all RichTextData instances replaced by strings.\n */\nfunction serializeAttributeValue( value: unknown ): unknown {\n\tif ( value instanceof RichTextData ) {\n\t\treturn value.valueOf();\n\t}\n\n\t// e.g. core/table `body`: [ { cells: [ { content: RichTextData } ] } ]\n\tif ( Array.isArray( value ) ) {\n\t\treturn value.map( serializeAttributeValue );\n\t}\n\n\t// e.g. a single row inside core/table `body`: { cells: [ ... ] }\n\tif ( value && typeof value === 'object' ) {\n\t\tconst result: Record< string, unknown > = {};\n\n\t\tfor ( const [ k, v ] of Object.entries( value ) ) {\n\t\t\tresult[ k ] = serializeAttributeValue( v );\n\t\t}\n\t\treturn result;\n\t}\n\n\treturn value;\n}\n\nfunction makeBlockAttributesSerializable(\n\tblockName: string,\n\tattributes: BlockAttributes\n): BlockAttributes {\n\tconst newAttributes = { ...attributes };\n\tfor ( const [ key, value ] of Object.entries( attributes ) ) {\n\t\tif ( isLocalAttribute( blockName, key ) ) {\n\t\t\tdelete newAttributes[ key ];\n\t\t\tcontinue;\n\t\t}\n\n\t\tnewAttributes[ key ] = serializeAttributeValue( value );\n\t}\n\treturn newAttributes;\n}\n\nfunction makeBlocksSerializable( blocks: Block[] ): Block[] {\n\treturn blocks.map( ( block: Block ) => {\n\t\tconst { name, innerBlocks, attributes, ...rest } = block;\n\t\tdelete rest.validationIssues;\n\t\treturn {\n\t\t\t...rest,\n\t\t\tname,\n\t\t\tattributes: makeBlockAttributesSerializable( name, attributes ),\n\t\t\tinnerBlocks: makeBlocksSerializable( innerBlocks ),\n\t\t};\n\t} );\n}\n\n/**\n * Recursively walk an attribute value and convert any strings that correspond\n * to rich-text schema nodes into RichTextData instances. This is the inverse\n * of serializeAttributeValue and handles nested structures like table cells.\n *\n * @param schema The attribute type definition for this value.\n * @param value The attribute value from CRDT (toJSON).\n * @return The value with rich-text strings replaced by RichTextData.\n */\nfunction deserializeAttributeValue(\n\tschema: BlockAttributeSchema | undefined,\n\tvalue: unknown\n): unknown {\n\tif ( schema?.type === 'rich-text' && typeof value === 'string' ) {\n\t\treturn getCachedRichTextData( value );\n\t}\n\n\t// e.g. core/table `body`: [ { cells: [ { content: RichTextData } ] } ]\n\tif ( Array.isArray( value ) ) {\n\t\treturn value.map( ( item ) =>\n\t\t\tdeserializeAttributeValue( schema, item )\n\t\t);\n\t}\n\n\t// e.g. a single row inside core/table `body`: { cells: [ ... ] }\n\tif ( value && typeof value === 'object' ) {\n\t\tconst result: Record< string, unknown > = {};\n\n\t\tfor ( const [ key, innerValue ] of Object.entries(\n\t\t\tvalue as Record< string, unknown >\n\t\t) ) {\n\t\t\tresult[ key ] = deserializeAttributeValue(\n\t\t\t\tschema?.query?.[ key ],\n\t\t\t\tinnerValue\n\t\t\t);\n\t\t}\n\n\t\treturn result;\n\t}\n\n\treturn value;\n}\n\n/**\n * Convert blocks from their CRDT-serialized form back to the runtime form\n * expected by the block editor. Rich-text attributes are stored as Y.Text in\n * the CRDT document, which serializes to plain strings via toJSON(). This\n * function restores them to RichTextData instances so that block edit\n * components that rely on RichTextData methods (e.g. `.text`) work correctly.\n *\n * @param blocks Blocks as extracted from the CRDT document via toJSON().\n * @return Blocks with rich-text attributes restored to RichTextData.\n */\nexport function deserializeBlockAttributes( blocks: Block[] ): Block[] {\n\treturn blocks.map( ( block: Block ) => {\n\t\tconst { name, innerBlocks, attributes, ...rest } = block;\n\n\t\tconst newAttributes = { ...attributes };\n\n\t\tfor ( const [ key, value ] of Object.entries( attributes ) ) {\n\t\t\tconst schema = getBlockAttributeSchema( name, key );\n\n\t\t\tif ( schema ) {\n\t\t\t\tnewAttributes[ key ] = deserializeAttributeValue(\n\t\t\t\t\tschema,\n\t\t\t\t\tvalue\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\treturn {\n\t\t\t...rest,\n\t\t\tname,\n\t\t\tattributes: newAttributes,\n\t\t\tinnerBlocks: deserializeBlockAttributes( innerBlocks ?? [] ),\n\t\t};\n\t} );\n}\n\n/**\n * @param {any} gblock\n * @param {Y.Map} yblock\n */\nfunction areBlocksEqual( gblock: Block, yblock: YBlock ): boolean {\n\tconst yblockAsJson = yblock.toJSON();\n\n\t// we must not sync clientId, as this can't be generated consistently and\n\t// hence will lead to merge conflicts.\n\tconst overwrites = {\n\t\tinnerBlocks: null,\n\t\tclientId: null,\n\t};\n\tconst res = fastDeepEqual(\n\t\tObject.assign( {}, gblock, overwrites ),\n\t\tObject.assign( {}, yblockAsJson, overwrites )\n\t);\n\tconst inners = gblock.innerBlocks || [];\n\tconst yinners = yblock.get( 'innerBlocks' );\n\treturn (\n\t\tres &&\n\t\tinners.length === yinners?.length &&\n\t\tinners.every( ( block: Block, i: number ) =>\n\t\t\tareBlocksEqual( block, yinners.get( i ) )\n\t\t)\n\t);\n}\n\nfunction createNewYAttributeMap(\n\tblockName: string,\n\tattributes: BlockAttributes\n): YBlockAttributes {\n\treturn new Y.Map(\n\t\tObject.entries( attributes ).map(\n\t\t\t( [ attributeName, attributeValue ] ) => {\n\t\t\t\treturn [\n\t\t\t\t\tattributeName,\n\t\t\t\t\tcreateNewYAttributeValue(\n\t\t\t\t\t\tblockName,\n\t\t\t\t\t\tattributeName,\n\t\t\t\t\t\tattributeValue\n\t\t\t\t\t),\n\t\t\t\t];\n\t\t\t}\n\t\t)\n\t);\n}\n\nfunction createNewYAttributeValue(\n\tblockName: string,\n\tattributeName: string,\n\tattributeValue: unknown\n): Y.Text | Y.Array< unknown > | Y.Map< unknown > | unknown {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\treturn createYValueFromSchema( schema, attributeValue );\n}\n\n/**\n * Recursively create the appropriate Y.js type for a value based on its\n * block-attribute schema.\n *\n * - `rich-text` -> Y.Text\n * - `array` with query -> Y.Array of Y.Maps\n * - `object` with query -> Y.Map\n * - anything else -> plain value (unchanged)\n *\n * @param schema The attribute type definition.\n * @param value The plain JS value to convert.\n * @return A Y.js type or the original value.\n */\nfunction createYValueFromSchema(\n\tschema: BlockAttributeSchema | undefined,\n\tvalue: unknown\n): Y.Text | Y.Array< unknown > | Y.Map< unknown > | unknown {\n\tif ( ! schema ) {\n\t\treturn value;\n\t}\n\n\tif ( schema.type === 'rich-text' ) {\n\t\treturn new Y.Text( value?.toString() ?? '' );\n\t}\n\n\tif ( schema.type === 'array' && schema.query && Array.isArray( value ) ) {\n\t\tconst query = schema.query;\n\t\tconst yArray = new Y.Array< Y.Map< unknown > >();\n\n\t\tyArray.insert(\n\t\t\t0,\n\t\t\tvalue.map( ( item ) => createYMapFromQuery( query, item ) )\n\t\t);\n\n\t\treturn yArray;\n\t}\n\n\tif ( schema.type === 'object' && schema.query && isRecord( value ) ) {\n\t\treturn createYMapFromQuery( schema.query, value );\n\t}\n\n\treturn value;\n}\n\n/**\n * Type guard that narrows `unknown` to `Record< string, unknown >`.\n *\n * @param value Value to check.\n * @return True if `value` is a non-null, non-array object.\n */\nfunction isRecord( value: unknown ): value is Record< string, unknown > {\n\treturn !! value && typeof value === 'object' && ! Array.isArray( value );\n}\n\n/**\n * Create a Y.Map from a plain object, using a query schema to decide which\n * properties should become nested Y.js types (Y.Text, Y.Array, Y.Map).\n *\n * @param query The query schema defining the properties.\n * @param obj The plain object to convert.\n * @return A Y.Map with typed values.\n */\nfunction createYMapFromQuery(\n\tquery: Record< string, BlockAttributeSchema >,\n\tobj: unknown\n): Y.Map< unknown > {\n\tif ( ! isRecord( obj ) ) {\n\t\treturn new Y.Map();\n\t}\n\n\tconst entries: [ string, unknown ][] = Object.entries( obj ).map(\n\t\t( [ key, val ] ): [ string, unknown ] => {\n\t\t\tconst subSchema = query[ key ];\n\t\t\treturn [ key, createYValueFromSchema( subSchema, val ) ];\n\t\t}\n\t);\n\n\treturn new Y.Map( entries );\n}\n\nfunction createNewYBlock( block: Block ): YBlock {\n\treturn createYMap< YBlockRecord >(\n\t\tObject.fromEntries(\n\t\t\tObject.entries( block ).map( ( [ key, value ] ) => {\n\t\t\t\tswitch ( key ) {\n\t\t\t\t\tcase 'attributes': {\n\t\t\t\t\t\treturn [\n\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\tcreateNewYAttributeMap( block.name, value ),\n\t\t\t\t\t\t];\n\t\t\t\t\t}\n\n\t\t\t\t\tcase 'innerBlocks': {\n\t\t\t\t\t\tconst innerBlocks = new Y.Array();\n\n\t\t\t\t\t\t// If not an array, set to empty Y.Array.\n\t\t\t\t\t\tif ( ! Array.isArray( value ) ) {\n\t\t\t\t\t\t\treturn [ key, innerBlocks ];\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\tinnerBlocks.insert(\n\t\t\t\t\t\t\t0,\n\t\t\t\t\t\t\tvalue.map( ( innerBlock: Block ) =>\n\t\t\t\t\t\t\t\tcreateNewYBlock( innerBlock )\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t);\n\n\t\t\t\t\t\treturn [ key, innerBlocks ];\n\t\t\t\t\t}\n\n\t\t\t\t\tdefault:\n\t\t\t\t\t\treturn [ key, value ];\n\t\t\t\t}\n\t\t\t} )\n\t\t)\n\t);\n}\n\n/**\n * Merge incoming block data into the local Y.Doc.\n * This function is called to sync local block changes to a shared Y.Doc.\n *\n * @param yblocks The blocks in the local Y.Doc.\n * @param incomingBlocks Gutenberg blocks being synced.\n * @param cursorPosition The position of the cursor after the change occurs.\n */\nexport function mergeCrdtBlocks(\n\tyblocks: YBlocks,\n\tincomingBlocks: Block[],\n\tcursorPosition: number | null\n): void {\n\t// Ensure we are working with serializable block data.\n\tif ( ! serializableBlocksCache.has( incomingBlocks ) ) {\n\t\tserializableBlocksCache.set(\n\t\t\tincomingBlocks,\n\t\t\tmakeBlocksSerializable( incomingBlocks )\n\t\t);\n\t}\n\tconst blocksToSync = serializableBlocksCache.get( incomingBlocks ) ?? [];\n\n\t// This is a rudimentary diff implementation similar to the y-prosemirror diffing\n\t// approach.\n\t// A better implementation would also diff the textual content and represent it\n\t// using a Y.Text type.\n\t// However, at this time it makes more sense to keep this algorithm generic to\n\t// support all kinds of block types.\n\t// Ideally, we ensure that block data structure have a consistent data format.\n\t// E.g.:\n\t// - textual content (using rich-text formatting?) may always be stored under `block.text`\n\t// - local information that shouldn't be shared (e.g. clientId or isDragging) is stored under `block.private`\n\t//\n\t// @credit Kevin Jahns (dmonad)\n\t// @link https://github.com/WordPress/gutenberg/pull/68483\n\tconst numOfCommonEntries = Math.min(\n\t\tblocksToSync.length ?? 0,\n\t\tyblocks.length\n\t);\n\n\tlet left = 0;\n\tlet right = 0;\n\n\t// skip equal blocks from left\n\tfor (\n\t\t;\n\t\tleft < numOfCommonEntries &&\n\t\tareBlocksEqual( blocksToSync[ left ], yblocks.get( left ) );\n\t\tleft++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// skip equal blocks from right\n\tfor (\n\t\t;\n\t\tright < numOfCommonEntries - left &&\n\t\tareBlocksEqual(\n\t\t\tblocksToSync[ blocksToSync.length - right - 1 ],\n\t\t\tyblocks.get( yblocks.length - right - 1 )\n\t\t);\n\t\tright++\n\t) {\n\t\t/* nop */\n\t}\n\n\tconst numOfUpdatesNeeded = numOfCommonEntries - left - right;\n\tconst numOfInsertionsNeeded = Math.max(\n\t\t0,\n\t\tblocksToSync.length - yblocks.length\n\t);\n\tconst numOfDeletionsNeeded = Math.max(\n\t\t0,\n\t\tyblocks.length - blocksToSync.length\n\t);\n\n\t// updates\n\tfor ( let i = 0; i < numOfUpdatesNeeded; i++, left++ ) {\n\t\tconst block = blocksToSync[ left ];\n\t\tconst yblock = yblocks.get( left );\n\n\t\tObject.entries( block ).forEach( ( [ key, value ] ) => {\n\t\t\tswitch ( key ) {\n\t\t\t\tcase 'attributes': {\n\t\t\t\t\tconst currentAttributes = yblock.get( key );\n\n\t\t\t\t\t// If attributes are not set on the yblock, use the new values.\n\t\t\t\t\tif ( ! currentAttributes ) {\n\t\t\t\t\t\tyblock.set(\n\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\tcreateNewYAttributeMap( block.name, value )\n\t\t\t\t\t\t);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\t\t\t\t\tObject.entries( value ).forEach(\n\t\t\t\t\t\t( [ attributeName, attributeValue ] ) => {\n\t\t\t\t\t\t\tconst currentAttribute =\n\t\t\t\t\t\t\t\tcurrentAttributes?.get( attributeName );\n\n\t\t\t\t\t\t\tconst isExpectedType = isExpectedAttributeType(\n\t\t\t\t\t\t\t\tblock.name,\n\t\t\t\t\t\t\t\tattributeName,\n\t\t\t\t\t\t\t\tcurrentAttribute\n\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t// Y types (Y.Text, Y.Array, Y.Map) cannot be\n\t\t\t\t\t\t\t// compared with fastDeepEqual against plain values.\n\t\t\t\t\t\t\t// Delegate to mergeYValue which handles no-op\n\t\t\t\t\t\t\t// detection at the edges.\n\t\t\t\t\t\t\tconst isYType =\n\t\t\t\t\t\t\t\tcurrentAttribute instanceof Y.AbstractType;\n\n\t\t\t\t\t\t\tconst isAttributeChanged =\n\t\t\t\t\t\t\t\t! isExpectedType ||\n\t\t\t\t\t\t\t\tisYType ||\n\t\t\t\t\t\t\t\t! fastDeepEqual(\n\t\t\t\t\t\t\t\t\tcurrentAttribute,\n\t\t\t\t\t\t\t\t\tattributeValue\n\t\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\tif ( isAttributeChanged ) {\n\t\t\t\t\t\t\t\tupdateYBlockAttribute(\n\t\t\t\t\t\t\t\t\tblock.name,\n\t\t\t\t\t\t\t\t\tattributeName,\n\t\t\t\t\t\t\t\t\tattributeValue,\n\t\t\t\t\t\t\t\t\tcurrentAttributes,\n\t\t\t\t\t\t\t\t\tcursorPosition\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t);\n\n\t\t\t\t\t// Delete any attributes that are no longer present.\n\t\t\t\t\tcurrentAttributes.forEach(\n\t\t\t\t\t\t( _attrValue: unknown, attrName: string ) => {\n\t\t\t\t\t\t\tif ( ! value.hasOwnProperty( attrName ) ) {\n\t\t\t\t\t\t\t\tcurrentAttributes.delete( attrName );\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t);\n\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tcase 'innerBlocks': {\n\t\t\t\t\t// Recursively merge innerBlocks\n\t\t\t\t\tlet yInnerBlocks = yblock.get( key );\n\n\t\t\t\t\tif ( ! ( yInnerBlocks instanceof Y.Array ) ) {\n\t\t\t\t\t\tyInnerBlocks = new Y.Array< YBlock >();\n\t\t\t\t\t\tyblock.set( key, yInnerBlocks );\n\t\t\t\t\t}\n\n\t\t\t\t\tmergeCrdtBlocks(\n\t\t\t\t\t\tyInnerBlocks,\n\t\t\t\t\t\tvalue ?? [],\n\t\t\t\t\t\tcursorPosition\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t\t}\n\n\t\t\t\tdefault:\n\t\t\t\t\tif ( ! fastDeepEqual( block[ key ], yblock.get( key ) ) ) {\n\t\t\t\t\t\tyblock.set( key, value );\n\t\t\t\t\t}\n\t\t\t}\n\t\t} );\n\t\tyblock.forEach( ( _v, k ) => {\n\t\t\tif ( ! block.hasOwnProperty( k ) ) {\n\t\t\t\tyblock.delete( k );\n\t\t\t}\n\t\t} );\n\t}\n\n\t// deletes\n\tyblocks.delete( left, numOfDeletionsNeeded );\n\n\t// inserts\n\tfor ( let i = 0; i < numOfInsertionsNeeded; i++, left++ ) {\n\t\tconst newBlock = [ createNewYBlock( blocksToSync[ left ] ) ];\n\n\t\tyblocks.insert( left, newBlock );\n\t}\n\n\t// remove duplicate clientids\n\tconst knownClientIds = new Set< string >();\n\tfor ( let j = 0; j < yblocks.length; j++ ) {\n\t\tconst yblock: YBlock = yblocks.get( j );\n\n\t\tlet clientId = yblock.get( 'clientId' );\n\n\t\tif ( ! clientId ) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif ( knownClientIds.has( clientId ) ) {\n\t\t\tclientId = uuidv4();\n\t\t\tyblock.set( 'clientId', clientId );\n\t\t}\n\t\tknownClientIds.add( clientId );\n\t}\n}\n\n/**\n * Compare a plain array element against a Y.Map element for equality.\n * Used by the left-right sweep diff in mergeYArray.\n *\n * @param newElement The plain object from the incoming array.\n * @param yElement The Y.Map element from the existing Y.Array.\n * @return True if the elements are deeply equal.\n */\nfunction areArrayElementsEqual(\n\tnewElement: unknown,\n\tyElement: unknown\n): boolean {\n\tif ( yElement instanceof Y.Map && isRecord( newElement ) ) {\n\t\treturn fastDeepEqual( newElement, yElement.toJSON() );\n\t}\n\n\treturn fastDeepEqual( newElement, yElement );\n}\n\n/**\n * Merge an incoming plain array into an existing Y.Array in-place.\n *\n * Uses the same left-right sweep diff approach as mergeCrdtBlocks:\n * equal elements are skipped from both ends, then the middle section\n * is updated, deleted, or inserted as needed. This preserves existing\n * Y.Map/Y.Text objects for unchanged elements, so concurrent edits\n * to those elements are not lost.\n *\n * @param yArray The existing Y.Array to update.\n * @param newValue The new plain array to merge into the Y.Array.\n * @param schema The attribute schema (must have `query`).\n * @param cursorPosition The local cursor position for rich-text delta merges.\n */\nfunction mergeYArray(\n\tyArray: Y.Array< unknown >,\n\tnewValue: unknown[],\n\tschema: BlockAttributeSchema,\n\tcursorPosition: number | null\n): void {\n\tif ( ! schema.query ) {\n\t\treturn;\n\t}\n\n\tconst query = schema.query;\n\tconst numOfCommonEntries = Math.min( newValue.length, yArray.length );\n\n\tlet left = 0;\n\tlet right = 0;\n\n\t// Skip equal elements from left.\n\tfor (\n\t\t;\n\t\tleft < numOfCommonEntries &&\n\t\tareArrayElementsEqual( newValue[ left ], yArray.get( left ) );\n\t\tleft++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// Skip equal elements from right.\n\tfor (\n\t\t;\n\t\tright < numOfCommonEntries - left &&\n\t\tareArrayElementsEqual(\n\t\t\tnewValue[ newValue.length - right - 1 ],\n\t\t\tyArray.get( yArray.length - right - 1 )\n\t\t);\n\t\tright++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// Updates: merge changed elements in-place.\n\tconst numOfUpdatesNeeded = numOfCommonEntries - left - right;\n\n\tfor ( let i = 0; i < numOfUpdatesNeeded; i++ ) {\n\t\tconst currentElement = yArray.get( left + i );\n\t\tconst newElement = newValue[ left + i ];\n\n\t\tif ( currentElement instanceof Y.Map && isRecord( newElement ) ) {\n\t\t\tmergeYMapValues(\n\t\t\t\tcurrentElement,\n\t\t\t\tnewElement,\n\t\t\t\tquery,\n\t\t\t\tcursorPosition\n\t\t\t);\n\t\t} else {\n\t\t\t// Element is the wrong type (e.g. partial migration) or the\n\t\t\t// incoming value is not an object. Rebuild the entire array.\n\t\t\tyArray.delete( 0, yArray.length );\n\t\t\tyArray.insert(\n\t\t\t\t0,\n\t\t\t\tnewValue.map( ( item ) => createYMapFromQuery( query, item ) )\n\t\t\t);\n\t\t\treturn;\n\t\t}\n\t}\n\n\t// Deletes.\n\tconst numOfDeletionsNeeded = Math.max( 0, yArray.length - newValue.length );\n\n\tif ( numOfDeletionsNeeded > 0 ) {\n\t\tyArray.delete( left + numOfUpdatesNeeded, numOfDeletionsNeeded );\n\t}\n\n\t// Inserts.\n\tconst numOfInsertionsNeeded = Math.max(\n\t\t0,\n\t\tnewValue.length - yArray.length\n\t);\n\n\tif ( numOfInsertionsNeeded > 0 ) {\n\t\tconst insertAt = left + numOfUpdatesNeeded;\n\t\tconst itemsToInsert: Y.Map< unknown >[] = new Array(\n\t\t\tnumOfInsertionsNeeded\n\t\t);\n\n\t\tfor ( let i = 0; i < numOfInsertionsNeeded; i++ ) {\n\t\t\titemsToInsert[ i ] = createYMapFromQuery(\n\t\t\t\tquery,\n\t\t\t\tnewValue[ insertAt + i ]\n\t\t\t);\n\t\t}\n\n\t\tyArray.insert( insertAt, itemsToInsert );\n\t}\n}\n\n/**\n * Merge a single value into a Y.Map entry, using the attribute schema to\n * decide how to merge.\n *\n * If the current value is already a matching Y.js type (Y.Text, Y.Array,\n * Y.Map), the update is merged in-place so concurrent edits are preserved.\n * Otherwise the value is replaced wholesale.\n *\n * @param schema The attribute type definition for this value.\n * @param newVal The new value to merge into the Y.Map entry.\n * @param yMap The Y.Map that owns this entry.\n * @param key The key of this entry in the Y.Map.\n * @param cursorPosition The local cursor position for rich-text delta merges.\n */\nfunction mergeYValue(\n\tschema: BlockAttributeSchema | undefined,\n\tnewVal: unknown,\n\tyMap: Y.Map< unknown >,\n\tkey: string,\n\tcursorPosition: number | null\n): void {\n\tconst currentVal = yMap.get( key );\n\tif (\n\t\tschema?.type === 'rich-text' &&\n\t\ttypeof newVal === 'string' &&\n\t\tcurrentVal instanceof Y.Text\n\t) {\n\t\tmergeRichTextUpdate( currentVal, newVal, cursorPosition );\n\t} else if (\n\t\tschema?.type === 'array' &&\n\t\tschema.query &&\n\t\tArray.isArray( newVal ) &&\n\t\tcurrentVal instanceof Y.Array\n\t) {\n\t\tmergeYArray( currentVal, newVal, schema, cursorPosition );\n\t} else if (\n\t\tschema?.type === 'object' &&\n\t\tschema.query &&\n\t\tisRecord( newVal ) &&\n\t\tcurrentVal instanceof Y.Map\n\t) {\n\t\tmergeYMapValues( currentVal, newVal, schema.query, cursorPosition );\n\t} else {\n\t\tconst newYValue = createYValueFromSchema( schema, newVal );\n\n\t\t// If createYValueFromSchema wrapped the value into a Y type, the\n\t\t// current value is the wrong type and needs upgrading. Otherwise,\n\t\t// only replace if the raw value actually changed.\n\t\tif ( newYValue !== newVal || ! fastDeepEqual( currentVal, newVal ) ) {\n\t\t\tyMap.set( key, newYValue );\n\t\t}\n\t}\n}\n\n/**\n * Merge an incoming plain object into an existing Y.Map in-place, using\n * the query schema to decide how each property should be merged.\n *\n * Properties present in the Y.Map but absent from `newObj` are deleted.\n *\n * @param yMap The existing Y.Map to update.\n * @param newObj The new plain object to merge into the Y.Map.\n * @param query The query schema defining property types.\n * @param cursorPosition The local cursor position for rich-text delta merges.\n */\nfunction mergeYMapValues(\n\tyMap: Y.Map< unknown >,\n\tnewObj: Record< string, unknown >,\n\tquery: Record< string, BlockAttributeSchema >,\n\tcursorPosition: number | null\n): void {\n\tfor ( const [ key, newVal ] of Object.entries( newObj ) ) {\n\t\tmergeYValue( query[ key ], newVal, yMap, key, cursorPosition );\n\t}\n\n\t// Delete properties absent from the incoming object.\n\tfor ( const key of yMap.keys() ) {\n\t\tif ( ! Object.hasOwn( newObj, key ) ) {\n\t\t\tyMap.delete( key );\n\t\t}\n\t}\n}\n\n/**\n * Update a single attribute on a Yjs block attributes map (currentAttributes).\n *\n * @param blockName The block type name, e.g. 'core/paragraph'.\n * @param attributeName The name of the attribute to update, e.g. 'content'.\n * @param attributeValue The new value for the attribute.\n * @param currentAttributes The Y.Map holding the block's current attributes.\n * @param cursorPosition The local cursor position, used when merging rich-text deltas.\n */\nfunction updateYBlockAttribute(\n\tblockName: string,\n\tattributeName: string,\n\tattributeValue: unknown,\n\tcurrentAttributes: YBlockAttributes,\n\tcursorPosition: number | null\n): void {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\n\tmergeYValue(\n\t\tschema,\n\t\tattributeValue,\n\t\tcurrentAttributes,\n\t\tattributeName,\n\t\tcursorPosition\n\t);\n}\n\n// Cached block attribute types, populated once from getBlockTypes().\nlet cachedBlockAttributeSchemas: Map<\n\tstring,\n\tMap< string, BlockAttributeSchema >\n>;\n\n/**\n * Get the attribute type definition for a block attribute.\n *\n * @param blockName The name of the block, e.g. 'core/paragraph'.\n * @param attributeName The name of the attribute, e.g. 'content'.\n * @return The type definition of the attribute.\n */\nfunction getBlockAttributeSchema(\n\tblockName: string,\n\tattributeName: string\n): BlockAttributeSchema | undefined {\n\tif ( ! cachedBlockAttributeSchemas ) {\n\t\t// Parse the attributes for all blocks once.\n\t\tcachedBlockAttributeSchemas = new Map();\n\n\t\tfor ( const blockType of getBlockTypes() as BlockType[] ) {\n\t\t\tcachedBlockAttributeSchemas.set(\n\t\t\t\tblockType.name,\n\t\t\t\tnew Map< string, BlockAttributeSchema >(\n\t\t\t\t\tObject.entries( blockType.attributes ?? {} ).map(\n\t\t\t\t\t\t( [ name, definition ] ) => {\n\t\t\t\t\t\t\tconst { role, type, query } = definition;\n\t\t\t\t\t\t\treturn [ name, { role, type, query } ];\n\t\t\t\t\t\t}\n\t\t\t\t\t)\n\t\t\t\t)\n\t\t\t);\n\t\t}\n\t}\n\n\treturn cachedBlockAttributeSchemas.get( blockName )?.get( attributeName );\n}\n\n/**\n * Check if an attribute value is the expected type.\n *\n * @param blockName The name of the block, e.g. 'core/paragraph'.\n * @param attributeName The name of the attribute, e.g. 'content'.\n * @param attributeValue The current attribute value.\n * @return True if the attribute type is expected, false otherwise.\n */\nfunction isExpectedAttributeType(\n\tblockName: string,\n\tattributeName: string,\n\tattributeValue: unknown\n): boolean {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\n\tif ( schema?.type === 'rich-text' ) {\n\t\treturn attributeValue instanceof Y.Text;\n\t}\n\n\tif ( schema?.type === 'string' ) {\n\t\treturn typeof attributeValue === 'string';\n\t}\n\n\tif ( schema?.type === 'array' && schema.query ) {\n\t\treturn attributeValue instanceof Y.Array;\n\t}\n\n\tif ( schema?.type === 'object' && schema.query ) {\n\t\treturn attributeValue instanceof Y.Map;\n\t}\n\n\treturn true;\n}\n\n/**\n * Given a block name and attribute key, return true if the attribute is local\n * and should not be synced.\n *\n * @param blockName The name of the block, e.g. 'core/image'.\n * @param attributeName The name of the attribute to check, e.g. 'blob'.\n * @return True if the attribute is local, false otherwise.\n */\nfunction isLocalAttribute( blockName: string, attributeName: string ): boolean {\n\treturn (\n\t\t'local' === getBlockAttributeSchema( blockName, attributeName )?.role\n\t);\n}\n\nlet localDoc: Y.Doc;\n\n/**\n * Given a Y.Text object and an updated string value, diff the new value and\n * apply the delta to the Y.Text.\n *\n * @param blockYText The Y.Text to update.\n * @param updatedValue The updated value.\n * @param cursorPosition The position of the cursor after the change occurs.\n */\nexport function mergeRichTextUpdate(\n\tblockYText: Y.Text,\n\tupdatedValue: string,\n\tcursorPosition: number | null = null\n): void {\n\t// Gutenberg does not use Yjs shared types natively, so we can only subscribe\n\t// to changes from store and apply them to Yjs types that we create and\n\t// manage. Crucially, for rich-text attributes, we do not receive granular\n\t// string updates; we get the new full string value on each change, even when\n\t// only a single character changed.\n\t//\n\t// The code below allows us to compute a delta between the current and new\n\t// value, then apply it to the Y.Text.\n\n\tif ( ! localDoc ) {\n\t\t// Y.Text must be attached to a Y.Doc to be able to do operations on it.\n\t\t// Create a temporary Y.Text attached to a local Y.Doc for delta computation.\n\t\tlocalDoc = new Y.Doc();\n\t}\n\n\tconst localYText = localDoc.getText( 'temporary-text' );\n\tlocalYText.delete( 0, localYText.length );\n\tlocalYText.insert( 0, updatedValue );\n\n\tconst currentValueAsDelta = new Delta( blockYText.toDelta() );\n\tconst updatedValueAsDelta = new Delta( localYText.toDelta() );\n\tconst deltaDiff = currentValueAsDelta.diffWithCursor(\n\t\tupdatedValueAsDelta,\n\t\tcursorPosition\n\t);\n\n\tblockYText.applyDelta( deltaDiff.ops );\n}\n"],
|
|
5
|
-
"mappings": "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",
|
|
4
|
+
"sourcesContent": ["/**\n * External dependencies\n */\nimport { v4 as uuidv4 } from 'uuid';\nimport fastDeepEqual from 'fast-deep-equal/es6/index.js';\n\n/**\n * WordPress dependencies\n */\nimport { getBlockTypes } from '@wordpress/blocks';\nimport { RichTextData } from '@wordpress/rich-text';\nimport { Y } from '@wordpress/sync';\n\n/**\n * Internal dependencies\n */\nimport {\n\tasRichTextOffset,\n\tcreateYMap,\n\trichTextOffsetToHtmlIndex,\n\ttype HtmlStringIndex,\n\ttype YMapRecord,\n\ttype YMapWrap,\n} from './crdt-utils';\nimport { getCachedRichTextData } from './crdt-text';\nimport { Delta } from '../sync';\nimport { type WPBlockSelection } from '../types';\n\ninterface BlockAttributes {\n\t[ key: string ]: unknown;\n}\n\ninterface BlockAttributeSchema {\n\trole?: string;\n\ttype?: string;\n\tquery?: Record< string, BlockAttributeSchema >;\n}\n\ninterface BlockType {\n\tattributes?: Record< string, BlockAttributeSchema >;\n\tname: string;\n}\n\n// A block as represented in Gutenberg's data store.\nexport interface Block {\n\tattributes: BlockAttributes;\n\tclientId?: string;\n\tinnerBlocks: Block[];\n\tisValid?: boolean;\n\tname: string;\n\toriginalContent?: string;\n\tvalidationIssues?: string[]; // unserializable\n}\n\n// A block as represented in the CRDT document (Y.Map).\nexport interface YBlockRecord extends YMapRecord {\n\tattributes: YBlockAttributes;\n\tclientId: string;\n\tinnerBlocks: YBlocks;\n\tisValid?: boolean;\n\toriginalContent?: string;\n\tname: string;\n}\n\nexport type YBlock = YMapWrap< YBlockRecord >;\nexport type YBlocks = Y.Array< YBlock >;\n\n// Block attribute schema cannot be known at compile time, so we use Y.Map.\n// Attribute values will be typed as the union of `Y.Text` and `unknown`.\nexport type YBlockAttributes = Y.Map< Y.Text | unknown >;\n\n/**\n * Optional description of where a cursor falls.\n *\n * Used to coordinate shifting of cursor when applying changes\n * to a Y.Doc with RichText instances.\n */\nexport type MergeCursorPosition = WPBlockSelection | null;\n\nconst serializableBlocksCache = new WeakMap< WeakKey, Block[] >();\n\n/**\n * Recursively walk an attribute value and convert any RichTextData instances\n * to their string (HTML) representation. This is necessary for array-type and\n * object-type attributes, which can contain nested RichTextData.\n *\n * @param value The attribute value to serialize.\n * @return The value with all RichTextData instances replaced by strings.\n */\nfunction serializeAttributeValue( value: unknown ): unknown {\n\tif ( value instanceof RichTextData ) {\n\t\treturn value.valueOf();\n\t}\n\n\t// e.g. core/table `body`: [ { cells: [ { content: RichTextData } ] } ]\n\tif ( Array.isArray( value ) ) {\n\t\treturn value.map( serializeAttributeValue );\n\t}\n\n\t// e.g. a single row inside core/table `body`: { cells: [ ... ] }\n\tif ( value && typeof value === 'object' ) {\n\t\tconst result: Record< string, unknown > = {};\n\n\t\tfor ( const [ k, v ] of Object.entries( value ) ) {\n\t\t\tresult[ k ] = serializeAttributeValue( v );\n\t\t}\n\t\treturn result;\n\t}\n\n\treturn value;\n}\n\nfunction makeBlockAttributesSerializable(\n\tblockName: string,\n\tattributes: BlockAttributes\n): BlockAttributes {\n\tconst newAttributes = { ...attributes };\n\tfor ( const [ key, value ] of Object.entries( attributes ) ) {\n\t\tif ( isLocalAttribute( blockName, key ) ) {\n\t\t\tdelete newAttributes[ key ];\n\t\t\tcontinue;\n\t\t}\n\n\t\tnewAttributes[ key ] = serializeAttributeValue( value );\n\t}\n\treturn newAttributes;\n}\n\n/**\n * Recursively removes properties which cannot be serialized from a list of block objects.\n *\n * @param blocks Eemove unserializable properties from each block object in this set.\n * @return Copies of the provided blocks without the unserializable properties.\n */\nfunction makeBlocksSerializable( blocks: Block[] ): Block[] {\n\treturn blocks.map( ( block: Block ) => {\n\t\tconst {\n\t\t\tname,\n\t\t\tinnerBlocks,\n\t\t\tattributes,\n\t\t\t/*\n\t\t\t * Any validation issues discovered when loading a block are appended\n\t\t\t * to the block node with a logging function, which cannot be serialized.\n\t\t\t *\n\t\t\t * @see import(\"@wordpress/blocks/src/api/parser\").parseRawBlock()\n\t\t\t */\n\t\t\tvalidationIssues,\n\t\t\t...rest\n\t\t} = block;\n\n\t\treturn {\n\t\t\t...rest,\n\t\t\tname,\n\t\t\tattributes: makeBlockAttributesSerializable( name, attributes ),\n\t\t\tinnerBlocks: makeBlocksSerializable( innerBlocks ),\n\t\t};\n\t} );\n}\n\n/**\n * Recursively walk an attribute value and convert any strings that correspond\n * to rich-text schema nodes into RichTextData instances. This is the inverse\n * of serializeAttributeValue and handles nested structures like table cells.\n *\n * @param schema The attribute type definition for this value.\n * @param value The attribute value from CRDT (toJSON).\n * @return The value with rich-text strings replaced by RichTextData.\n */\nfunction deserializeAttributeValue(\n\tschema: BlockAttributeSchema | undefined,\n\tvalue: unknown\n): unknown {\n\tif ( schema?.type === 'rich-text' && typeof value === 'string' ) {\n\t\treturn getCachedRichTextData( value );\n\t}\n\n\t// e.g. core/table `body`: [ { cells: [ { content: RichTextData } ] } ]\n\tif ( Array.isArray( value ) ) {\n\t\treturn value.map( ( item ) =>\n\t\t\tdeserializeAttributeValue( schema, item )\n\t\t);\n\t}\n\n\t// e.g. a single row inside core/table `body`: { cells: [ ... ] }\n\tif ( value && typeof value === 'object' ) {\n\t\tconst result: Record< string, unknown > = {};\n\n\t\tfor ( const [ key, innerValue ] of Object.entries(\n\t\t\tvalue as Record< string, unknown >\n\t\t) ) {\n\t\t\tresult[ key ] = deserializeAttributeValue(\n\t\t\t\tschema?.query?.[ key ],\n\t\t\t\tinnerValue\n\t\t\t);\n\t\t}\n\n\t\treturn result;\n\t}\n\n\treturn value;\n}\n\n/**\n * Convert blocks from their CRDT-serialized form back to the runtime form\n * expected by the block editor. Rich-text attributes are stored as Y.Text in\n * the CRDT document, which serializes to plain strings via toJSON(). This\n * function restores them to RichTextData instances so that block edit\n * components that rely on RichTextData methods (e.g. `.text`) work correctly.\n *\n * @param blocks Blocks as extracted from the CRDT document via toJSON().\n * @return Blocks with rich-text attributes restored to RichTextData.\n */\nexport function deserializeBlockAttributes( blocks: Block[] ): Block[] {\n\treturn blocks.map( ( block: Block ) => {\n\t\tconst { name, innerBlocks, attributes, ...rest } = block;\n\n\t\tconst newAttributes = { ...attributes };\n\n\t\tfor ( const [ key, value ] of Object.entries( attributes ) ) {\n\t\t\tconst schema = getBlockAttributeSchema( name, key );\n\n\t\t\tif ( schema ) {\n\t\t\t\tnewAttributes[ key ] = deserializeAttributeValue(\n\t\t\t\t\tschema,\n\t\t\t\t\tvalue\n\t\t\t\t);\n\t\t\t}\n\t\t}\n\n\t\treturn {\n\t\t\t...rest,\n\t\t\tname,\n\t\t\tattributes: newAttributes,\n\t\t\tinnerBlocks: deserializeBlockAttributes( innerBlocks ?? [] ),\n\t\t};\n\t} );\n}\n\n/**\n * @param {any} gblock\n * @param {Y.Map} yblock\n */\nfunction areBlocksEqual( gblock: Block, yblock: YBlock ): boolean {\n\tconst yblockAsJson = yblock.toJSON();\n\n\t// we must not sync clientId, as this can't be generated consistently and\n\t// hence will lead to merge conflicts.\n\tconst overwrites = {\n\t\tinnerBlocks: null,\n\t\tclientId: null,\n\t};\n\tconst res = fastDeepEqual(\n\t\tObject.assign( {}, gblock, overwrites ),\n\t\tObject.assign( {}, yblockAsJson, overwrites )\n\t);\n\tconst inners = gblock.innerBlocks || [];\n\tconst yinners = yblock.get( 'innerBlocks' );\n\treturn (\n\t\tres &&\n\t\tinners.length === yinners?.length &&\n\t\tinners.every( ( block: Block, i: number ) =>\n\t\t\tareBlocksEqual( block, yinners.get( i ) )\n\t\t)\n\t);\n}\n\nfunction createNewYAttributeMap(\n\tblockName: string,\n\tattributes: BlockAttributes\n): YBlockAttributes {\n\treturn new Y.Map(\n\t\tObject.entries( attributes ).map(\n\t\t\t( [ attributeName, attributeValue ] ) => {\n\t\t\t\treturn [\n\t\t\t\t\tattributeName,\n\t\t\t\t\tcreateNewYAttributeValue(\n\t\t\t\t\t\tblockName,\n\t\t\t\t\t\tattributeName,\n\t\t\t\t\t\tattributeValue\n\t\t\t\t\t),\n\t\t\t\t];\n\t\t\t}\n\t\t)\n\t);\n}\n\nfunction createNewYAttributeValue(\n\tblockName: string,\n\tattributeName: string,\n\tattributeValue: unknown\n): Y.Text | Y.Array< unknown > | Y.Map< unknown > | unknown {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\treturn createYValueFromSchema( schema, attributeValue );\n}\n\n/**\n * Recursively create the appropriate Y.js type for a value based on its\n * block-attribute schema.\n *\n * - `rich-text` -> Y.Text\n * - `array` with query -> Y.Array of Y.Maps\n * - `object` with query -> Y.Map\n * - anything else -> plain value (unchanged)\n *\n * @param schema The attribute type definition.\n * @param value The plain JS value to convert.\n * @return A Y.js type or the original value.\n */\nfunction createYValueFromSchema(\n\tschema: BlockAttributeSchema | undefined,\n\tvalue: unknown\n): Y.Text | Y.Array< unknown > | Y.Map< unknown > | unknown {\n\tif ( ! schema ) {\n\t\treturn value;\n\t}\n\n\tif ( schema.type === 'rich-text' ) {\n\t\treturn new Y.Text( value?.toString() ?? '' );\n\t}\n\n\tif ( schema.type === 'array' && schema.query && Array.isArray( value ) ) {\n\t\tconst query = schema.query;\n\t\tconst yArray = new Y.Array< Y.Map< unknown > >();\n\n\t\tyArray.insert(\n\t\t\t0,\n\t\t\tvalue.map( ( item ) => createYMapFromQuery( query, item ) )\n\t\t);\n\n\t\treturn yArray;\n\t}\n\n\tif ( schema.type === 'object' && schema.query && isRecord( value ) ) {\n\t\treturn createYMapFromQuery( schema.query, value );\n\t}\n\n\treturn value;\n}\n\n/**\n * Type guard that narrows `unknown` to `Record< string, unknown >`.\n *\n * @param value Value to check.\n * @return True if `value` is a non-null, non-array object.\n */\nfunction isRecord( value: unknown ): value is Record< string, unknown > {\n\treturn !! value && typeof value === 'object' && ! Array.isArray( value );\n}\n\n/**\n * Create a Y.Map from a plain object, using a query schema to decide which\n * properties should become nested Y.js types (Y.Text, Y.Array, Y.Map).\n *\n * @param query The query schema defining the properties.\n * @param obj The plain object to convert.\n * @return A Y.Map with typed values.\n */\nfunction createYMapFromQuery(\n\tquery: Record< string, BlockAttributeSchema >,\n\tobj: unknown\n): Y.Map< unknown > {\n\tif ( ! isRecord( obj ) ) {\n\t\treturn new Y.Map();\n\t}\n\n\tconst entries: [ string, unknown ][] = Object.entries( obj ).map(\n\t\t( [ key, val ] ): [ string, unknown ] => {\n\t\t\tconst subSchema = query[ key ];\n\t\t\treturn [ key, createYValueFromSchema( subSchema, val ) ];\n\t\t}\n\t);\n\n\treturn new Y.Map( entries );\n}\n\nfunction createNewYBlock( block: Block ): YBlock {\n\treturn createYMap< YBlockRecord >(\n\t\tObject.fromEntries(\n\t\t\tObject.entries( block ).map( ( [ key, value ] ) => {\n\t\t\t\tswitch ( key ) {\n\t\t\t\t\tcase 'attributes': {\n\t\t\t\t\t\treturn [\n\t\t\t\t\t\t\tkey,\n\t\t\t\t\t\t\tcreateNewYAttributeMap( block.name, value ),\n\t\t\t\t\t\t];\n\t\t\t\t\t}\n\n\t\t\t\t\tcase 'innerBlocks': {\n\t\t\t\t\t\tconst innerBlocks = new Y.Array();\n\n\t\t\t\t\t\t// If not an array, set to empty Y.Array.\n\t\t\t\t\t\tif ( ! Array.isArray( value ) ) {\n\t\t\t\t\t\t\treturn [ key, innerBlocks ];\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\tinnerBlocks.insert(\n\t\t\t\t\t\t\t0,\n\t\t\t\t\t\t\tvalue.map( ( innerBlock: Block ) =>\n\t\t\t\t\t\t\t\tcreateNewYBlock( innerBlock )\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t);\n\n\t\t\t\t\t\treturn [ key, innerBlocks ];\n\t\t\t\t\t}\n\n\t\t\t\t\tdefault:\n\t\t\t\t\t\treturn [ key, value ];\n\t\t\t\t}\n\t\t\t} )\n\t\t)\n\t);\n}\n\n/**\n * Merge incoming block data into the local Y.Doc.\n * This function is called to sync local block changes to a shared Y.Doc.\n *\n * @param yblocks The blocks in the local Y.Doc.\n * @param incomingBlocks Gutenberg blocks being synced.\n * @param attributeCursor When provided, describes a selection cursor falling within a\n * RichText field associated with a specific block and attribute.\n * Derived from the changes that produced the blocks.\n */\nexport function mergeCrdtBlocks(\n\tyblocks: YBlocks,\n\tincomingBlocks: Block[],\n\tattributeCursor: MergeCursorPosition\n): void {\n\t// Ensure we are working with serializable block data.\n\tif ( ! serializableBlocksCache.has( incomingBlocks ) ) {\n\t\tserializableBlocksCache.set(\n\t\t\tincomingBlocks,\n\t\t\tmakeBlocksSerializable( incomingBlocks )\n\t\t);\n\t}\n\n\tconst incomingBlocksToSync =\n\t\tserializableBlocksCache.get( incomingBlocks ) ?? [];\n\n\t// This is a rudimentary diff implementation similar to the y-prosemirror diffing\n\t// approach.\n\t// A better implementation would also diff the textual content and represent it\n\t// using a Y.Text type.\n\t// However, at this time it makes more sense to keep this algorithm generic to\n\t// support all kinds of block types.\n\t// Ideally, we ensure that block data structure have a consistent data format.\n\t// E.g.:\n\t// - textual content (using rich-text formatting?) may always be stored under `block.text`\n\t// - local information that shouldn't be shared (e.g. clientId or isDragging) is stored under `block.private`\n\t//\n\t// @credit Kevin Jahns (dmonad)\n\t// @link https://github.com/WordPress/gutenberg/pull/68483\n\tconst numOfCommonEntries = Math.min(\n\t\tincomingBlocksToSync.length ?? 0,\n\t\tyblocks.length\n\t);\n\n\tlet left = 0;\n\tlet right = 0;\n\n\t// skip equal blocks from left\n\tfor (\n\t\t;\n\t\tleft < numOfCommonEntries &&\n\t\tareBlocksEqual( incomingBlocksToSync[ left ], yblocks.get( left ) );\n\t\tleft++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// skip equal blocks from right\n\tfor (\n\t\t;\n\t\tright < numOfCommonEntries - left &&\n\t\tareBlocksEqual(\n\t\t\tincomingBlocksToSync[ incomingBlocksToSync.length - right - 1 ],\n\t\t\tyblocks.get( yblocks.length - right - 1 )\n\t\t);\n\t\tright++\n\t) {\n\t\t/* nop */\n\t}\n\n\tconst numOfUpdatesNeeded = numOfCommonEntries - left - right;\n\tconst numOfInsertionsNeeded = Math.max(\n\t\t0,\n\t\tincomingBlocksToSync.length - yblocks.length\n\t);\n\tconst numOfDeletionsNeeded = Math.max(\n\t\t0,\n\t\tyblocks.length - incomingBlocksToSync.length\n\t);\n\n\t// updates\n\tfor ( let i = 0; i < numOfUpdatesNeeded; i++, left++ ) {\n\t\tconst incomingYBlock = incomingBlocksToSync[ left ];\n\t\tconst localYBlock = yblocks.get( left );\n\n\t\tObject.entries( incomingYBlock ).forEach(\n\t\t\t( [ incomingBlockProperty, incomingBlockPropertyValue ] ) => {\n\t\t\t\tswitch ( incomingBlockProperty ) {\n\t\t\t\t\tcase 'attributes': {\n\t\t\t\t\t\tconst localAttributes = localYBlock.get(\n\t\t\t\t\t\t\tincomingBlockProperty\n\t\t\t\t\t\t);\n\t\t\t\t\t\tconst incomingAttributes = incomingBlockPropertyValue;\n\n\t\t\t\t\t\t// When the local block has no attributes, adopt the incoming set.\n\t\t\t\t\t\tif ( ! localAttributes ) {\n\t\t\t\t\t\t\tlocalYBlock.set(\n\t\t\t\t\t\t\t\tincomingBlockProperty,\n\t\t\t\t\t\t\t\tcreateNewYAttributeMap(\n\t\t\t\t\t\t\t\t\tincomingYBlock.name,\n\t\t\t\t\t\t\t\t\tincomingAttributes\n\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\tbreak;\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t// Otherwise the attributes need to be merged.\n\t\t\t\t\t\tObject.entries( incomingAttributes ).forEach(\n\t\t\t\t\t\t\t( [\n\t\t\t\t\t\t\t\tincomingAttributeName,\n\t\t\t\t\t\t\t\tincomingAttributeValue,\n\t\t\t\t\t\t\t] ) => {\n\t\t\t\t\t\t\t\tconst currentAttribute = localAttributes?.get(\n\t\t\t\t\t\t\t\t\tincomingAttributeName\n\t\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t\tconst isExpectedType = isExpectedAttributeType(\n\t\t\t\t\t\t\t\t\tincomingYBlock.name,\n\t\t\t\t\t\t\t\t\tincomingAttributeName,\n\t\t\t\t\t\t\t\t\tcurrentAttribute\n\t\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t\t// Y types (Y.Text, Y.Array, Y.Map) cannot be\n\t\t\t\t\t\t\t\t// compared with fastDeepEqual against plain values.\n\t\t\t\t\t\t\t\t// Delegate to mergeYValue which handles no-op\n\t\t\t\t\t\t\t\t// detection at the edges.\n\t\t\t\t\t\t\t\tconst isYType =\n\t\t\t\t\t\t\t\t\tcurrentAttribute instanceof Y.AbstractType;\n\n\t\t\t\t\t\t\t\tconst isAttributeChanged =\n\t\t\t\t\t\t\t\t\t! isExpectedType ||\n\t\t\t\t\t\t\t\t\tisYType ||\n\t\t\t\t\t\t\t\t\t! fastDeepEqual(\n\t\t\t\t\t\t\t\t\t\tcurrentAttribute,\n\t\t\t\t\t\t\t\t\t\tincomingAttributeValue\n\t\t\t\t\t\t\t\t\t);\n\n\t\t\t\t\t\t\t\tif ( isAttributeChanged ) {\n\t\t\t\t\t\t\t\t\tupdateYBlockAttribute(\n\t\t\t\t\t\t\t\t\t\tincomingYBlock.name,\n\t\t\t\t\t\t\t\t\t\tincomingYBlock.clientId,\n\t\t\t\t\t\t\t\t\t\tincomingAttributeName,\n\t\t\t\t\t\t\t\t\t\tincomingAttributeValue,\n\t\t\t\t\t\t\t\t\t\tlocalAttributes,\n\t\t\t\t\t\t\t\t\t\tattributeCursor\n\t\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t);\n\n\t\t\t\t\t\t// Delete any attributes that are no longer present.\n\t\t\t\t\t\tlocalAttributes.forEach(\n\t\t\t\t\t\t\t( _attrValue: unknown, attrName: string ) => {\n\t\t\t\t\t\t\t\tif (\n\t\t\t\t\t\t\t\t\t! incomingBlockPropertyValue.hasOwnProperty(\n\t\t\t\t\t\t\t\t\t\tattrName\n\t\t\t\t\t\t\t\t\t)\n\t\t\t\t\t\t\t\t) {\n\t\t\t\t\t\t\t\t\tlocalAttributes.delete( attrName );\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t);\n\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\t\t\t\t\tcase 'innerBlocks': {\n\t\t\t\t\t\t// Recursively merge innerBlocks\n\t\t\t\t\t\tlet yInnerBlocks = localYBlock.get(\n\t\t\t\t\t\t\tincomingBlockProperty\n\t\t\t\t\t\t);\n\n\t\t\t\t\t\tif ( ! ( yInnerBlocks instanceof Y.Array ) ) {\n\t\t\t\t\t\t\tyInnerBlocks = new Y.Array< YBlock >();\n\t\t\t\t\t\t\tlocalYBlock.set(\n\t\t\t\t\t\t\t\tincomingBlockProperty,\n\t\t\t\t\t\t\t\tyInnerBlocks\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\tmergeCrdtBlocks(\n\t\t\t\t\t\t\tyInnerBlocks,\n\t\t\t\t\t\t\tincomingBlockPropertyValue ?? [],\n\t\t\t\t\t\t\tattributeCursor\n\t\t\t\t\t\t);\n\t\t\t\t\t\tbreak;\n\t\t\t\t\t}\n\n\t\t\t\t\tdefault:\n\t\t\t\t\t\tif (\n\t\t\t\t\t\t\t! fastDeepEqual(\n\t\t\t\t\t\t\t\tincomingYBlock[ incomingBlockProperty ],\n\t\t\t\t\t\t\t\tlocalYBlock.get( incomingBlockProperty )\n\t\t\t\t\t\t\t)\n\t\t\t\t\t\t) {\n\t\t\t\t\t\t\tlocalYBlock.set(\n\t\t\t\t\t\t\t\tincomingBlockProperty,\n\t\t\t\t\t\t\t\tincomingBlockPropertyValue\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t);\n\t\tlocalYBlock.forEach( ( _v, k ) => {\n\t\t\tif ( ! incomingYBlock.hasOwnProperty( k ) ) {\n\t\t\t\tlocalYBlock.delete( k );\n\t\t\t}\n\t\t} );\n\t}\n\n\t// deletes\n\tyblocks.delete( left, numOfDeletionsNeeded );\n\n\t// inserts\n\tfor ( let i = 0; i < numOfInsertionsNeeded; i++, left++ ) {\n\t\tconst newBlock = [ createNewYBlock( incomingBlocksToSync[ left ] ) ];\n\n\t\tyblocks.insert( left, newBlock );\n\t}\n\n\t// remove duplicate clientids\n\tconst knownClientIds = new Set< string >();\n\tfor ( let j = 0; j < yblocks.length; j++ ) {\n\t\tconst yblock: YBlock = yblocks.get( j );\n\n\t\tlet clientId = yblock.get( 'clientId' );\n\n\t\tif ( ! clientId ) {\n\t\t\tcontinue;\n\t\t}\n\n\t\tif ( knownClientIds.has( clientId ) ) {\n\t\t\tclientId = uuidv4();\n\t\t\tyblock.set( 'clientId', clientId );\n\t\t}\n\t\tknownClientIds.add( clientId );\n\t}\n}\n\n/**\n * Compare a plain array element against a Y.Map element for equality.\n * Used by the left-right sweep diff in mergeYArray.\n *\n * @param newElement The plain object from the incoming array.\n * @param yElement The Y.Map element from the existing Y.Array.\n * @return True if the elements are deeply equal.\n */\nfunction areArrayElementsEqual(\n\tnewElement: unknown,\n\tyElement: unknown\n): boolean {\n\tif ( yElement instanceof Y.Map && isRecord( newElement ) ) {\n\t\treturn fastDeepEqual( newElement, yElement.toJSON() );\n\t}\n\n\treturn fastDeepEqual( newElement, yElement );\n}\n\n/**\n * Merge an incoming plain array into an existing Y.Array in-place.\n *\n * Uses the same left-right sweep diff approach as mergeCrdtBlocks:\n * equal elements are skipped from both ends, then the middle section\n * is updated, deleted, or inserted as needed. This preserves existing\n * Y.Map/Y.Text objects for unchanged elements, so concurrent edits\n * to those elements are not lost.\n *\n * @param yArray The existing Y.Array to update.\n * @param newValue The new plain array to merge into the Y.Array.\n * @param schema The attribute schema (must have `query`).\n * @param cursorPosition The local cursor position for rich-text delta merges.\n * @param cursorScope The selected block attribute scope for rich-text cursor hints.\n */\nfunction mergeYArray(\n\tyArray: Y.Array< unknown >,\n\tnewValue: unknown[],\n\tschema: BlockAttributeSchema,\n\tcursorPosition: MergeCursorPosition,\n\tcursorScope: RichTextCursorScope\n): void {\n\tif ( ! schema.query ) {\n\t\treturn;\n\t}\n\n\tconst query = schema.query;\n\tconst numOfCommonEntries = Math.min( newValue.length, yArray.length );\n\n\tlet left = 0;\n\tlet right = 0;\n\n\t// Skip equal elements from left.\n\tfor (\n\t\t;\n\t\tleft < numOfCommonEntries &&\n\t\tareArrayElementsEqual( newValue[ left ], yArray.get( left ) );\n\t\tleft++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// Skip equal elements from right.\n\tfor (\n\t\t;\n\t\tright < numOfCommonEntries - left &&\n\t\tareArrayElementsEqual(\n\t\t\tnewValue[ newValue.length - right - 1 ],\n\t\t\tyArray.get( yArray.length - right - 1 )\n\t\t);\n\t\tright++\n\t) {\n\t\t/* nop */\n\t}\n\n\t// Updates: merge changed elements in-place.\n\tconst numOfUpdatesNeeded = numOfCommonEntries - left - right;\n\n\tfor ( let i = 0; i < numOfUpdatesNeeded; i++ ) {\n\t\tconst currentElement = yArray.get( left + i );\n\t\tconst newElement = newValue[ left + i ];\n\n\t\tif ( currentElement instanceof Y.Map && isRecord( newElement ) ) {\n\t\t\tmergeYMapValues(\n\t\t\t\tcurrentElement,\n\t\t\t\tnewElement,\n\t\t\t\tquery,\n\t\t\t\tcursorPosition,\n\t\t\t\tcursorScope\n\t\t\t);\n\t\t} else {\n\t\t\t// Element is the wrong type (e.g. partial migration) or the\n\t\t\t// incoming value is not an object. Rebuild the entire array.\n\t\t\tyArray.delete( 0, yArray.length );\n\t\t\tyArray.insert(\n\t\t\t\t0,\n\t\t\t\tnewValue.map( ( item ) => createYMapFromQuery( query, item ) )\n\t\t\t);\n\t\t\treturn;\n\t\t}\n\t}\n\n\t// Deletes.\n\tconst numOfDeletionsNeeded = Math.max( 0, yArray.length - newValue.length );\n\n\tif ( numOfDeletionsNeeded > 0 ) {\n\t\tyArray.delete( left + numOfUpdatesNeeded, numOfDeletionsNeeded );\n\t}\n\n\t// Inserts.\n\tconst numOfInsertionsNeeded = Math.max(\n\t\t0,\n\t\tnewValue.length - yArray.length\n\t);\n\n\tif ( numOfInsertionsNeeded > 0 ) {\n\t\tconst insertAt = left + numOfUpdatesNeeded;\n\t\tconst itemsToInsert: Y.Map< unknown >[] = new Array(\n\t\t\tnumOfInsertionsNeeded\n\t\t);\n\n\t\tfor ( let i = 0; i < numOfInsertionsNeeded; i++ ) {\n\t\t\titemsToInsert[ i ] = createYMapFromQuery(\n\t\t\t\tquery,\n\t\t\t\tnewValue[ insertAt + i ]\n\t\t\t);\n\t\t}\n\n\t\tyArray.insert( insertAt, itemsToInsert );\n\t}\n}\n\n/**\n * Merge a single value into a Y.Map entry, using the attribute schema to\n * decide how to merge.\n *\n * If the current value is already a matching Y.js type (Y.Text, Y.Array,\n * Y.Map), the update is merged in-place so concurrent edits are preserved.\n * Otherwise the value is replaced wholesale.\n *\n * @param schema The attribute type definition for this value.\n * @param newVal The new value to merge into the Y.Map entry.\n * @param yMap The Y.Map that owns this entry.\n * @param key The key of this entry in the Y.Map.\n * @param cursorPosition The cursor position for rich-text delta merges from the updated value.\n * @param cursorScope Indicates a specific block and attribute associated with the editor;\n * determines whether the cursor should be updated based on the change.\n */\nfunction mergeYValue(\n\tschema: BlockAttributeSchema | undefined,\n\tnewVal: unknown,\n\tyMap: Y.Map< unknown >,\n\tkey: string,\n\tcursorPosition: MergeCursorPosition,\n\tcursorScope: RichTextCursorScope\n): void {\n\tconst currentVal = yMap.get( key );\n\tif (\n\t\tschema?.type === 'rich-text' &&\n\t\ttypeof newVal === 'string' &&\n\t\tcurrentVal instanceof Y.Text\n\t) {\n\t\tmergeRichTextUpdate(\n\t\t\tcurrentVal,\n\t\t\tnewVal,\n\t\t\tresolveRichTextCursorPosition( cursorPosition, cursorScope, newVal )\n\t\t);\n\t} else if (\n\t\tschema?.type === 'array' &&\n\t\tschema.query &&\n\t\tArray.isArray( newVal ) &&\n\t\tcurrentVal instanceof Y.Array\n\t) {\n\t\tmergeYArray( currentVal, newVal, schema, cursorPosition, cursorScope );\n\t} else if (\n\t\tschema?.type === 'object' &&\n\t\tschema.query &&\n\t\tisRecord( newVal ) &&\n\t\tcurrentVal instanceof Y.Map\n\t) {\n\t\tmergeYMapValues(\n\t\t\tcurrentVal,\n\t\t\tnewVal,\n\t\t\tschema.query,\n\t\t\tcursorPosition,\n\t\t\tcursorScope\n\t\t);\n\t} else {\n\t\tconst newYValue = createYValueFromSchema( schema, newVal );\n\n\t\t// If createYValueFromSchema wrapped the value into a Y type, the\n\t\t// current value is the wrong type and needs upgrading. Otherwise,\n\t\t// only replace if the raw value actually changed.\n\t\tif ( newYValue !== newVal || ! fastDeepEqual( currentVal, newVal ) ) {\n\t\t\tyMap.set( key, newYValue );\n\t\t}\n\t}\n}\n\n/**\n * Merge an incoming plain object into an existing Y.Map in-place, using\n * the query schema to decide how each property should be merged.\n *\n * Properties present in the Y.Map but absent from `newObj` are deleted.\n *\n * @param yMap The existing Y.Map to update.\n * @param newObj The new plain object to merge into the Y.Map.\n * @param query The query schema defining property types.\n * @param cursorPosition The local cursor position for rich-text delta merges.\n * @param cursorScope The selected block attribute scope for rich-text cursor hints.\n */\nfunction mergeYMapValues(\n\tyMap: Y.Map< unknown >,\n\tnewObj: Record< string, unknown >,\n\tquery: Record< string, BlockAttributeSchema >,\n\tcursorPosition: MergeCursorPosition,\n\tcursorScope: RichTextCursorScope\n): void {\n\tfor ( const [ key, newVal ] of Object.entries( newObj ) ) {\n\t\tmergeYValue(\n\t\t\tquery[ key ],\n\t\t\tnewVal,\n\t\t\tyMap,\n\t\t\tkey,\n\t\t\tcursorPosition,\n\t\t\tcursorScope\n\t\t);\n\t}\n\n\t// Delete properties absent from the incoming object.\n\tfor ( const key of yMap.keys() ) {\n\t\tif ( ! Object.hasOwn( newObj, key ) ) {\n\t\t\tyMap.delete( key );\n\t\t}\n\t}\n}\n\n/**\n * Update a single attribute on a Yjs block attributes map (currentAttributes).\n *\n * @param blockName The block type name, e.g. 'core/paragraph'.\n * @param clientId The local clientId for the block being merged.\n * @param attributeName The name of the attribute to update, e.g. 'content'.\n * @param attributeValue The new value for the attribute.\n * @param currentAttributes The Y.Map holding the block's current attributes.\n * @param newCursorPosition The cursor position for rich-text delta merges from the updated value.\n * Notably, this may not correspond to the attribute being edited and is\n * used to determine if any cursors need shifting in response to the change.\n */\nfunction updateYBlockAttribute(\n\tblockName: string,\n\tclientId: string | undefined,\n\tattributeName: string,\n\tattributeValue: unknown,\n\tcurrentAttributes: YBlockAttributes,\n\tnewCursorPosition: MergeCursorPosition\n): void {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\n\t/*\n\t * @todo There is a slight discrepancy between the attribute name and key, which might\n\t * show up when working with multiline RichText instances (of which there are no\n\t * more within Core). For those instances, a cursor might never be updated in\n\t * response to changes because its `attributeKey` won\u2019t match any of the block\u2019s\n\t * attribute names, and since updating this attribute is based on the block names,\n\t * no suitable key for the cursor scope will be created. To fix, the updating code\n\t * would need to parse multiline attributes and infer the `attributeKey` being updated.\n\t */\n\tmergeYValue(\n\t\tschema,\n\t\tattributeValue,\n\t\tcurrentAttributes,\n\t\tattributeName,\n\t\tnewCursorPosition,\n\t\t{ attributeKey: attributeName, clientId }\n\t);\n}\n\n/**\n * References the specific block and attribute associated with a RichText component.\n *\n * This is used to associate a cursor with the attribute it\u2019s editing.\n *\n * @see WPBlockSelection\n */\ninterface RichTextCursorScope {\n\tattributeKey: string;\n\tclientId: string | undefined;\n}\n\ninterface DeltaWithOps {\n\tops: Parameters< Y.Text[ 'applyDelta' ] >[ 0 ];\n}\n\n/**\n * When the provided cursor falls within the given block and attribute\u2019s scope,\n * returns an index into the RichText\u2019s serialized HTML where the cursor falls.\n *\n * The cursor scope constrains resolution to ensure that indices are only reported\n * when a cursor falls within the block and attribute being updated, since the\n * attributes being updated may not always be the ones where a cursor presently falls.\n *\n * Returned index measures JS string lengths, thus is counted in UTF-16 code units\n * and contains the syntax characters making up HTML tags, comments, character\n * references, and other non-plaintext content.\n *\n * @param cursorPosition Description of the cursor in the new value.\n * @param cursorScope Cursors should only be updated if they fall within this\n * specific block and attribute.\n * @param updatedValue New RichText value potentially containing cursor.\n * @return String length into serialized HTML for RichText instance where cursor falls.\n */\nfunction resolveRichTextCursorPosition(\n\tcursorPosition: MergeCursorPosition,\n\tcursorScope: RichTextCursorScope,\n\tupdatedValue: string\n): HtmlStringIndex | null {\n\treturn cursorPosition &&\n\t\tcursorPosition.clientId === cursorScope.clientId &&\n\t\tcursorPosition.attributeKey === cursorScope.attributeKey &&\n\t\t'number' === typeof cursorPosition.offset &&\n\t\tNumber.isInteger( cursorPosition.offset )\n\t\t? richTextOffsetToHtmlIndex(\n\t\t\t\tupdatedValue,\n\t\t\t\tasRichTextOffset( cursorPosition.offset )\n\t\t )\n\t\t: null;\n}\n\n// Cached block attribute types, populated once from getBlockTypes().\nlet cachedBlockAttributeSchemas: Map<\n\tstring,\n\tMap< string, BlockAttributeSchema >\n>;\n\n/**\n * Get the attribute type definition for a block attribute.\n *\n * @param blockName The name of the block, e.g. 'core/paragraph'.\n * @param attributeName The name of the attribute, e.g. 'content'.\n * @return The type definition of the attribute.\n */\nfunction getBlockAttributeSchema(\n\tblockName: string,\n\tattributeName: string\n): BlockAttributeSchema | undefined {\n\tif ( ! cachedBlockAttributeSchemas ) {\n\t\t// Parse the attributes for all blocks once.\n\t\tcachedBlockAttributeSchemas = new Map();\n\n\t\tfor ( const blockType of getBlockTypes() as BlockType[] ) {\n\t\t\tcachedBlockAttributeSchemas.set(\n\t\t\t\tblockType.name,\n\t\t\t\tnew Map< string, BlockAttributeSchema >(\n\t\t\t\t\tObject.entries( blockType.attributes ?? {} ).map(\n\t\t\t\t\t\t( [ name, definition ] ) => {\n\t\t\t\t\t\t\tconst { role, type, query } = definition;\n\t\t\t\t\t\t\treturn [ name, { role, type, query } ];\n\t\t\t\t\t\t}\n\t\t\t\t\t)\n\t\t\t\t)\n\t\t\t);\n\t\t}\n\t}\n\n\treturn cachedBlockAttributeSchemas.get( blockName )?.get( attributeName );\n}\n\n/**\n * Check if an attribute value is the expected type.\n *\n * @param blockName The name of the block, e.g. 'core/paragraph'.\n * @param attributeName The name of the attribute, e.g. 'content'.\n * @param attributeValue The current attribute value.\n * @return True if the attribute type is expected, false otherwise.\n */\nfunction isExpectedAttributeType(\n\tblockName: string,\n\tattributeName: string,\n\tattributeValue: unknown\n): boolean {\n\tconst schema = getBlockAttributeSchema( blockName, attributeName );\n\n\tif ( schema?.type === 'rich-text' ) {\n\t\treturn attributeValue instanceof Y.Text;\n\t}\n\n\tif ( schema?.type === 'string' ) {\n\t\treturn typeof attributeValue === 'string';\n\t}\n\n\tif ( schema?.type === 'array' && schema.query ) {\n\t\treturn attributeValue instanceof Y.Array;\n\t}\n\n\tif ( schema?.type === 'object' && schema.query ) {\n\t\treturn attributeValue instanceof Y.Map;\n\t}\n\n\treturn true;\n}\n\n/**\n * Given a block name and attribute key, return true if the attribute is local\n * and should not be synced.\n *\n * @param blockName The name of the block, e.g. 'core/image'.\n * @param attributeName The name of the attribute to check, e.g. 'blob'.\n * @return True if the attribute is local, false otherwise.\n */\nfunction isLocalAttribute( blockName: string, attributeName: string ): boolean {\n\treturn (\n\t\t'local' === getBlockAttributeSchema( blockName, attributeName )?.role\n\t);\n}\n\nlet localDoc: Y.Doc;\n\n/**\n * Given a Y.Text object and an updated string value, diff the new value and\n * apply the delta to the Y.Text.\n *\n * @param blockYText The Y.Text to update.\n * @param updatedValue The updated value.\n * @param htmlCursorIndex The cursor index in the updated HTML string.\n */\nexport function mergeRichTextUpdate(\n\tblockYText: Y.Text,\n\tupdatedValue: string,\n\thtmlCursorIndex: HtmlStringIndex | null = null\n): void {\n\t// Gutenberg does not use Yjs shared types natively, so we can only subscribe\n\t// to changes from store and apply them to Yjs types that we create and\n\t// manage. Crucially, for rich-text attributes, we do not receive granular\n\t// string updates; we get the new full string value on each change, even when\n\t// only a single character changed.\n\t//\n\t// The code below allows us to compute a delta between the current and new\n\t// value, then apply it to the Y.Text.\n\n\tconst currentValueAsDelta = new Delta( blockYText.toDelta() );\n\tconst updatedValueAsDelta = new Delta( [ { insert: updatedValue } ] );\n\tconst deltaDiff = currentValueAsDelta.diffWithCursor(\n\t\tupdatedValueAsDelta,\n\t\thtmlCursorIndex\n\t);\n\n\t/**\n\t * When there is no cursor involved, or when the diff is able to shuffle properly\n\t * around the cursor then apply that already-computed diff.\n\t *\n\t * However, `diffWithCursor()` currently fails in certain cases, producing corrupted\n\t * output. In these cases, fall back to the raw diff as that will apply cleanly,\n\t * even if it provides a less meaningful diff.\n\t *\n\t * @see Delta.diffWithCursor()\n\t */\n\tconst safeDiff =\n\t\thtmlCursorIndex === null ||\n\t\tisDeltaVerificationMatch( blockYText, deltaDiff, updatedValue )\n\t\t\t? deltaDiff\n\t\t\t: currentValueAsDelta.diff( updatedValueAsDelta );\n\n\tblockYText.applyDelta( safeDiff.ops );\n}\n\n/**\n * Verify that applying a delta to an existing Y.Text object produces the expected\n * output string.\n *\n * A stale, mis-scoped, or corrupted Delta will mutate a text value to the wrong\n * output string. This function applies the given Delta and indicates whether it\n * produces the given expected output string value.\n *\n * @param blockYText The current Y.Text before applying the candidate delta.\n * @param delta The candidate delta.\n * @param expectedValue The exact string expected after applying the delta.\n * @return Whether the candidate delta produces the expected value.\n */\nfunction isDeltaVerificationMatch(\n\tblockYText: Y.Text,\n\tdelta: DeltaWithOps,\n\texpectedValue: string\n): boolean {\n\tif ( ! localDoc ) {\n\t\t// Y.Text must be attached to a Y.Doc to be able to do operations on it.\n\t\t// Create a temporary Y.Text attached to a local Y.Doc for delta computation.\n\t\t// This is an optimization to avoid creating a new Y.Doc on every update.\n\t\tlocalDoc = new Y.Doc();\n\t}\n\n\tconst verificationYText = localDoc.getText( 'verification-text' );\n\n\t// Because this is global, it must be cleared before using.\n\tverificationYText.delete( 0, verificationYText.length );\n\tverificationYText.insert( 0, blockYText.toString() );\n\tverificationYText.applyDelta( delta.ops );\n\n\treturn verificationYText.toString() === expectedValue;\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
YSelectionType
|
|
9
9
|
} from "./block-selection-history.mjs";
|
|
10
10
|
import {
|
|
11
|
+
asHtmlStringIndex,
|
|
11
12
|
findBlockByClientIdInDoc,
|
|
12
13
|
htmlIndexToRichTextOffset
|
|
13
14
|
} from "./crdt-utils.mjs";
|
|
@@ -39,7 +40,7 @@ function convertYSelectionToBlockSelection(ySelection, ydoc) {
|
|
|
39
40
|
attributeKey,
|
|
40
41
|
offset: htmlIndexToRichTextOffset(
|
|
41
42
|
absolutePosition.type.toString(),
|
|
42
|
-
absolutePosition.index
|
|
43
|
+
asHtmlStringIndex(absolutePosition.index)
|
|
43
44
|
)
|
|
44
45
|
};
|
|
45
46
|
}
|