@focus-reactive/payload-plugin-visual-editing 1.2.0 → 1.3.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/README.md +265 -31
- package/dist/admin/InstantPreviewBroadcaster.js +44 -3
- package/dist/admin/InstantPreviewBroadcaster.js.map +1 -1
- package/dist/admin/PreviewPageBridge.d.ts +1 -0
- package/dist/admin/PreviewPageBridge.js +50 -0
- package/dist/admin/PreviewPageBridge.js.map +1 -0
- package/dist/admin/VisualEditingBridgeProvider.js +60 -35
- package/dist/admin/VisualEditingBridgeProvider.js.map +1 -1
- package/dist/admin/expandAndFocus.d.ts +1 -0
- package/dist/admin/expandAndFocus.js +122 -99
- package/dist/admin/expandAndFocus.js.map +1 -1
- package/dist/admin/index.d.ts +1 -0
- package/dist/admin/index.js +1 -0
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/instantPreview/previewGrants.d.ts +14 -0
- package/dist/admin/instantPreview/previewGrants.js +62 -0
- package/dist/admin/instantPreview/previewGrants.js.map +1 -0
- package/dist/admin/instantPreview/usePreviewPage.d.ts +2 -1
- package/dist/admin/instantPreview/usePreviewPage.js +12 -3
- package/dist/admin/instantPreview/usePreviewPage.js.map +1 -1
- package/dist/admin/openField/openForms.d.ts +7 -0
- package/dist/admin/openField/openForms.js +40 -0
- package/dist/admin/openField/openForms.js.map +1 -1
- package/dist/admin/previewPages.d.ts +7 -0
- package/dist/admin/previewPages.js +13 -0
- package/dist/admin/previewPages.js.map +1 -0
- package/dist/client/createOverlay.js +3 -0
- package/dist/client/createOverlay.js.map +1 -1
- package/dist/client/index.d.ts +6 -6
- package/dist/client/index.js +5 -5
- package/dist/client/index.js.map +1 -1
- package/dist/client/instantPreview/instantPreview.js +1 -1
- package/dist/client/instantPreview/instantPreview.js.map +1 -1
- package/dist/client/instantPreview/liveFields.d.ts +2 -1
- package/dist/client/instantPreview/liveFields.js +32 -5
- package/dist/client/instantPreview/liveFields.js.map +1 -1
- package/dist/client/instantPreview/liveRichTextOf.d.ts +3 -0
- package/dist/client/instantPreview/liveRichTextOf.js +3 -0
- package/dist/client/instantPreview/liveRichTextOf.js.map +1 -1
- package/dist/client/instantPreview/unsavedRender/baseValues.d.ts +12 -0
- package/dist/client/instantPreview/unsavedRender/baseValues.js +130 -0
- package/dist/client/instantPreview/unsavedRender/baseValues.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.d.ts +29 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.js +117 -0
- package/dist/client/instantPreview/unsavedRender/liveRichText.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.d.ts +6 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.js +20 -0
- package/dist/client/instantPreview/unsavedRender/optimisticValue.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.d.ts +26 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.js +77 -0
- package/dist/client/instantPreview/unsavedRender/renderSources.js.map +1 -0
- package/dist/client/instantPreview/unsavedRender/unsavedRender.d.ts +6 -1
- package/dist/client/instantPreview/unsavedRender/unsavedRender.js +116 -17
- package/dist/client/instantPreview/unsavedRender/unsavedRender.js.map +1 -1
- package/dist/client/instantPreview/unsavedRender/valueSource.d.ts +17 -0
- package/dist/client/instantPreview/unsavedRender/valueSource.js +38 -0
- package/dist/client/instantPreview/unsavedRender/valueSource.js.map +1 -0
- package/dist/client/overlay/constants.d.ts +1 -2
- package/dist/client/overlay/constants.js +1 -7
- package/dist/client/overlay/constants.js.map +1 -1
- package/dist/client/overlay/fieldTracker.d.ts +2 -0
- package/dist/client/overlay/fieldTracker.js +140 -42
- package/dist/client/overlay/fieldTracker.js.map +1 -1
- package/dist/client/overlay/hoverController.js +3 -3
- package/dist/client/overlay/hoverController.js.map +1 -1
- package/dist/client/overlay/markerCleaner.d.ts +5 -0
- package/dist/client/overlay/markerCleaner.js +94 -0
- package/dist/client/overlay/markerCleaner.js.map +1 -0
- package/dist/client/overlay/markerExtractor.js +1 -1
- package/dist/client/overlay/markerExtractor.js.map +1 -1
- package/dist/client/overlay/mutationPipeline.d.ts +3 -0
- package/dist/client/overlay/mutationPipeline.js +15 -9
- package/dist/client/overlay/mutationPipeline.js.map +1 -1
- package/dist/client/overlay/pageNodes.d.ts +3 -0
- package/dist/client/overlay/pageNodes.js +34 -0
- package/dist/client/overlay/pageNodes.js.map +1 -0
- package/dist/client/overlayClickHandler.js +3 -2
- package/dist/client/overlayClickHandler.js.map +1 -1
- package/dist/client/overlayScope.d.ts +14 -0
- package/dist/client/overlayScope.js +23 -0
- package/dist/client/overlayScope.js.map +1 -0
- package/dist/client/previewGrant.d.ts +5 -0
- package/dist/client/previewGrant.js +34 -0
- package/dist/client/previewGrant.js.map +1 -0
- package/dist/client/react/LiveRichText.d.ts +17 -0
- package/dist/client/react/LiveRichText.js +32 -0
- package/dist/client/react/LiveRichText.js.map +1 -0
- package/dist/client/react/UnsavedRenderBoundary.js.map +1 -0
- package/dist/client/react/VisualEditingOverlay.js +60 -0
- package/dist/client/react/VisualEditingOverlay.js.map +1 -0
- package/dist/client/react/VisualEditingProvider.d.ts +21 -0
- package/dist/client/react/VisualEditingProvider.js +83 -0
- package/dist/client/react/VisualEditingProvider.js.map +1 -0
- package/dist/client/react/VisualEditingToggle.d.ts +1 -0
- package/dist/client/react/VisualEditingToggle.js +32 -0
- package/dist/client/react/VisualEditingToggle.js.map +1 -0
- package/dist/client/react/overlayContext.d.ts +2 -0
- package/dist/client/react/overlayContext.js +4 -0
- package/dist/client/react/overlayContext.js.map +1 -0
- package/dist/client/react/useIsomorphicLayoutEffect.js.map +1 -0
- package/dist/client/react/useUnsavedRender.d.ts +16 -0
- package/dist/client/react/useUnsavedRender.js +89 -0
- package/dist/client/react/useUnsavedRender.js.map +1 -0
- package/dist/client/saveEvents.d.ts +3 -0
- package/dist/client/saveEvents.js +27 -0
- package/dist/client/saveEvents.js.map +1 -0
- package/dist/client/session.d.ts +40 -0
- package/dist/client/session.js +100 -0
- package/dist/client/session.js.map +1 -0
- package/dist/client/sessionOverlay.d.ts +9 -0
- package/dist/client/sessionOverlay.js +74 -0
- package/dist/client/sessionOverlay.js.map +1 -0
- package/dist/client/toggle.d.ts +7 -0
- package/dist/client/toggle.js +158 -0
- package/dist/client/toggle.js.map +1 -0
- package/dist/client/withVisualEditingPath.d.ts +2 -0
- package/dist/client/withVisualEditingPath.js +5 -6
- package/dist/client/withVisualEditingPath.js.map +1 -1
- package/dist/dom/index.d.ts +6 -0
- package/dist/dom/index.js +7 -0
- package/dist/dom/index.js.map +1 -0
- package/dist/dom/liveRichTextElements.d.ts +8 -0
- package/dist/dom/liveRichTextElements.js +69 -0
- package/dist/dom/liveRichTextElements.js.map +1 -0
- package/dist/dom/mountVisualEditing.d.ts +16 -0
- package/dist/dom/mountVisualEditing.js +52 -0
- package/dist/dom/mountVisualEditing.js.map +1 -0
- package/dist/excludeValues.d.ts +0 -4
- package/dist/excludeValues.js +4 -4
- package/dist/excludeValues.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.js +13 -4
- package/dist/index.js.map +1 -1
- package/dist/readUnsavedRichText.d.ts +16 -2
- package/dist/readUnsavedRichText.js +26 -7
- package/dist/readUnsavedRichText.js.map +1 -1
- package/dist/server/endpoints.d.ts +16 -0
- package/dist/server/endpoints.js +136 -0
- package/dist/server/endpoints.js.map +1 -0
- package/dist/server/markRead.js +3 -3
- package/dist/server/markRead.js.map +1 -1
- package/dist/server/markedReads.d.ts +1 -1
- package/dist/server/markedReads.js +4 -2
- package/dist/server/markedReads.js.map +1 -1
- package/dist/server/previewGrant.d.ts +9 -0
- package/dist/server/previewGrant.js +31 -0
- package/dist/server/previewGrant.js.map +1 -0
- package/dist/server/unsavedRichText/hooks.js +24 -9
- package/dist/server/unsavedRichText/hooks.js.map +1 -1
- package/dist/server/unsavedRichText/placeUnsavedState.js +1 -1
- package/dist/server/unsavedRichText/placeUnsavedState.js.map +1 -1
- package/dist/server/unsavedRichText/postedEditorState.js +3 -31
- package/dist/server/unsavedRichText/postedEditorState.js.map +1 -1
- package/dist/server/unsavedRichText/postedRequest.d.ts +2 -1
- package/dist/server/unsavedRichText/postedRequest.js +14 -4
- package/dist/server/unsavedRichText/postedRequest.js.map +1 -1
- package/dist/server/unsavedRichText/readAsUser.d.ts +7 -2
- package/dist/server/unsavedRichText/readAsUser.js +47 -16
- package/dist/server/unsavedRichText/readAsUser.js.map +1 -1
- package/dist/server/unsavedRichText/readContext.d.ts +6 -0
- package/dist/server/unsavedRichText/readContext.js +5 -0
- package/dist/server/unsavedRichText/readContext.js.map +1 -1
- package/dist/server/unsavedRichText/savedReferences.d.ts +5 -0
- package/dist/server/unsavedRichText/savedReferences.js +61 -0
- package/dist/server/unsavedRichText/savedReferences.js.map +1 -0
- package/dist/server/withDocumentControls.d.ts +10 -0
- package/dist/server/{withInstantPreview.js → withDocumentControls.js} +17 -7
- package/dist/server/withDocumentControls.js.map +1 -0
- package/dist/shared/buildAdminEditUrl.d.ts +1 -0
- package/dist/shared/buildAdminEditUrl.js +5 -1
- package/dist/shared/buildAdminEditUrl.js.map +1 -1
- package/dist/shared/protocol.d.ts +18 -0
- package/dist/shared/protocol.js +6 -0
- package/dist/shared/protocol.js.map +1 -1
- package/dist/shared/richText/editorStateTree.d.ts +2 -0
- package/dist/shared/richText/editorStateTree.js +34 -0
- package/dist/shared/richText/editorStateTree.js.map +1 -0
- package/dist/{server → shared}/richText/markTextLeaves.js +5 -5
- package/dist/shared/richText/markTextLeaves.js.map +1 -0
- package/dist/shared/richText/nodeKey.d.ts +3 -2
- package/dist/shared/richText/nodeKey.js +15 -6
- package/dist/shared/richText/nodeKey.js.map +1 -1
- package/dist/shared/richText/references.d.ts +16 -0
- package/dist/shared/richText/references.js +85 -0
- package/dist/shared/richText/references.js.map +1 -0
- package/dist/{server/unsavedRichText → shared/richText}/relatedIds.d.ts +1 -1
- package/dist/{server/unsavedRichText → shared/richText}/relatedIds.js +4 -4
- package/dist/shared/richText/relatedIds.js.map +1 -0
- package/dist/shared/richText/savedNodeFields.d.ts +3 -0
- package/dist/{server/unsavedRichText → shared/richText}/savedNodeFields.js +4 -4
- package/dist/shared/richText/savedNodeFields.js.map +1 -0
- package/dist/shared/shared.d.ts +14 -3
- package/dist/shared/shared.js +46 -1
- package/dist/shared/shared.js.map +1 -1
- package/dist/shared/stegaText.d.ts +2 -1
- package/dist/shared/stegaText.js +3 -1
- package/dist/shared/stegaText.js.map +1 -1
- package/package.json +26 -4
- package/dist/client/VisualEditingOverlay.js +0 -39
- package/dist/client/VisualEditingOverlay.js.map +0 -1
- package/dist/client/VisualEditingProvider.d.ts +0 -25
- package/dist/client/VisualEditingProvider.js +0 -68
- package/dist/client/VisualEditingProvider.js.map +0 -1
- package/dist/client/VisualEditingToggle.d.ts +0 -1
- package/dist/client/VisualEditingToggle.js +0 -153
- package/dist/client/VisualEditingToggle.js.map +0 -1
- package/dist/client/instantPreview/LiveRichText.d.ts +0 -16
- package/dist/client/instantPreview/LiveRichText.js +0 -18
- package/dist/client/instantPreview/LiveRichText.js.map +0 -1
- package/dist/client/instantPreview/unsavedRender/UnsavedRenderBoundary.js.map +0 -1
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.d.ts +0 -10
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js +0 -118
- package/dist/client/instantPreview/unsavedRender/useUnsavedRender.js.map +0 -1
- package/dist/client/overlayContext.d.ts +0 -3
- package/dist/client/overlayContext.js +0 -5
- package/dist/client/overlayContext.js.map +0 -1
- package/dist/client/useIsomorphicLayoutEffect.js.map +0 -1
- package/dist/client/useVisualEditingOverlay.d.ts +0 -4
- package/dist/client/useVisualEditingOverlay.js +0 -33
- package/dist/client/useVisualEditingOverlay.js.map +0 -1
- package/dist/server/richText/markTextLeaves.js.map +0 -1
- package/dist/server/unsavedRichText/relatedIds.js.map +0 -1
- package/dist/server/unsavedRichText/savedNodeFields.d.ts +0 -2
- package/dist/server/unsavedRichText/savedNodeFields.js.map +0 -1
- package/dist/server/withInstantPreview.d.ts +0 -9
- package/dist/server/withInstantPreview.js.map +0 -1
- /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.d.ts +0 -0
- /package/dist/client/{instantPreview/unsavedRender → react}/UnsavedRenderBoundary.js +0 -0
- /package/dist/client/{VisualEditingOverlay.d.ts → react/VisualEditingOverlay.d.ts} +0 -0
- /package/dist/client/{useIsomorphicLayoutEffect.d.ts → react/useIsomorphicLayoutEffect.d.ts} +0 -0
- /package/dist/client/{useIsomorphicLayoutEffect.js → react/useIsomorphicLayoutEffect.js} +0 -0
- /package/dist/{server → shared}/richText/markTextLeaves.d.ts +0 -0
|
@@ -0,0 +1,136 @@
|
|
|
1
|
+
import { readUnsavedRichTextFor } from "../readUnsavedRichText.js";
|
|
2
|
+
import { readJsonBody } from "./unsavedRichText/jsonBody.js";
|
|
3
|
+
import { isPlainObject } from "../shared/plainObject.js";
|
|
4
|
+
import { VE_PREVIEW_GRANT_PATH, VE_UNSAVED_RICH_TEXT_PATH } from "../shared/protocol.js";
|
|
5
|
+
import { documentAddressOf, isVeDocument, veDocumentOf } from "../shared/veDocument.js";
|
|
6
|
+
import { PREVIEW_GRANT_TTL_MS, readPreviewGrant, signPreviewGrant } from "./previewGrant.js";
|
|
7
|
+
const MAX_BODY_BYTES = 4 * 1024 * 1024;
|
|
8
|
+
export const ENDPOINT_READ_TIME_LIMIT_MS = 8000;
|
|
9
|
+
const BODY_TIME_LIMIT_MS = 10_000;
|
|
10
|
+
const HTML_FORMAT = "html";
|
|
11
|
+
const json = (body, status)=>Response.json(body, {
|
|
12
|
+
headers: {
|
|
13
|
+
"Cache-Control": "no-store"
|
|
14
|
+
},
|
|
15
|
+
status
|
|
16
|
+
});
|
|
17
|
+
const jsonToAnyOrigin = (body, status, req)=>{
|
|
18
|
+
const origin = req.headers.get("Origin");
|
|
19
|
+
const headers = new Headers({
|
|
20
|
+
"Cache-Control": "no-store",
|
|
21
|
+
Vary: "Origin"
|
|
22
|
+
});
|
|
23
|
+
if (origin) headers.set("Access-Control-Allow-Origin", origin);
|
|
24
|
+
return Response.json(body, {
|
|
25
|
+
headers,
|
|
26
|
+
status
|
|
27
|
+
});
|
|
28
|
+
};
|
|
29
|
+
const parsed = (text)=>{
|
|
30
|
+
try {
|
|
31
|
+
return JSON.parse(text);
|
|
32
|
+
} catch {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
const bodyOf = async (req)=>{
|
|
37
|
+
if (Number(req.headers.get("Content-Length") ?? 0) > MAX_BODY_BYTES) return null;
|
|
38
|
+
if (req.body instanceof ReadableStream) {
|
|
39
|
+
return readJsonBody(req, MAX_BODY_BYTES, AbortSignal.timeout(BODY_TIME_LIMIT_MS));
|
|
40
|
+
}
|
|
41
|
+
const text = req.text ? await req.text() : "";
|
|
42
|
+
return text.length > MAX_BODY_BYTES ? null : parsed(text);
|
|
43
|
+
};
|
|
44
|
+
const grantEndpoint = {
|
|
45
|
+
handler: async (req)=>{
|
|
46
|
+
const { user } = req;
|
|
47
|
+
if (!user) return json({
|
|
48
|
+
grant: null
|
|
49
|
+
}, 401);
|
|
50
|
+
const body = await bodyOf(req);
|
|
51
|
+
if (!isPlainObject(body) || !isVeDocument(body)) return json({
|
|
52
|
+
grant: null
|
|
53
|
+
}, 400);
|
|
54
|
+
const expiresAt = Date.now() + PREVIEW_GRANT_TTL_MS;
|
|
55
|
+
const grant = signPreviewGrant({
|
|
56
|
+
document: documentAddressOf(veDocumentOf(body)),
|
|
57
|
+
expiresAt,
|
|
58
|
+
userCollection: user.collection,
|
|
59
|
+
userId: user.id
|
|
60
|
+
}, req.payload.secret);
|
|
61
|
+
return json({
|
|
62
|
+
expiresAt,
|
|
63
|
+
grant
|
|
64
|
+
}, 200);
|
|
65
|
+
},
|
|
66
|
+
method: "post",
|
|
67
|
+
path: VE_PREVIEW_GRANT_PATH
|
|
68
|
+
};
|
|
69
|
+
const grantedUserOf = async (req, token)=>{
|
|
70
|
+
const grant = readPreviewGrant(token, req.payload.secret, Date.now());
|
|
71
|
+
if (!grant) return null;
|
|
72
|
+
const auth = req.payload.collections[grant.userCollection]?.config.auth;
|
|
73
|
+
if (!auth) return null;
|
|
74
|
+
const user = await req.payload.findByID({
|
|
75
|
+
collection: grant.userCollection,
|
|
76
|
+
depth: auth.depth,
|
|
77
|
+
disableErrors: true,
|
|
78
|
+
id: grant.userId,
|
|
79
|
+
overrideAccess: true
|
|
80
|
+
});
|
|
81
|
+
return user ? {
|
|
82
|
+
document: grant.document,
|
|
83
|
+
user: {
|
|
84
|
+
...user,
|
|
85
|
+
collection: grant.userCollection
|
|
86
|
+
}
|
|
87
|
+
} : null;
|
|
88
|
+
};
|
|
89
|
+
const unsavedRichTextEndpoint = ({ depth, readWholeDocument, renderHtml })=>({
|
|
90
|
+
handler: async (req)=>{
|
|
91
|
+
const body = await bodyOf(req);
|
|
92
|
+
if (!isPlainObject(body)) return jsonToAnyOrigin({
|
|
93
|
+
value: null
|
|
94
|
+
}, 400, req);
|
|
95
|
+
const granted = await grantedUserOf(req, body.grant);
|
|
96
|
+
if (!granted) return jsonToAnyOrigin({
|
|
97
|
+
value: null
|
|
98
|
+
}, 401, req);
|
|
99
|
+
const value = await readUnsavedRichTextFor({
|
|
100
|
+
allows: ({ field })=>documentAddressOf(field) === granted.document,
|
|
101
|
+
depth,
|
|
102
|
+
payload: req.payload,
|
|
103
|
+
readWholeDocument,
|
|
104
|
+
request: body.request,
|
|
105
|
+
timeLimitMs: ENDPOINT_READ_TIME_LIMIT_MS,
|
|
106
|
+
user: granted.user
|
|
107
|
+
});
|
|
108
|
+
if (body.format !== HTML_FORMAT) return jsonToAnyOrigin({
|
|
109
|
+
value
|
|
110
|
+
}, 200, req);
|
|
111
|
+
if (value === null || !renderHtml || !isPlainObject(body.request)) {
|
|
112
|
+
return jsonToAnyOrigin({
|
|
113
|
+
html: null
|
|
114
|
+
}, 200, req);
|
|
115
|
+
}
|
|
116
|
+
const request = body.request;
|
|
117
|
+
req.user = granted.user;
|
|
118
|
+
const html = await renderHtml({
|
|
119
|
+
field: request.field,
|
|
120
|
+
locale: request.locale,
|
|
121
|
+
req,
|
|
122
|
+
value
|
|
123
|
+
});
|
|
124
|
+
return jsonToAnyOrigin({
|
|
125
|
+
html
|
|
126
|
+
}, 200, req);
|
|
127
|
+
},
|
|
128
|
+
method: "post",
|
|
129
|
+
path: VE_UNSAVED_RICH_TEXT_PATH
|
|
130
|
+
});
|
|
131
|
+
export const visualEditingEndpoints = (options)=>[
|
|
132
|
+
grantEndpoint,
|
|
133
|
+
unsavedRichTextEndpoint(options)
|
|
134
|
+
];
|
|
135
|
+
|
|
136
|
+
//# sourceMappingURL=endpoints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/server/endpoints.ts"],"sourcesContent":["import type { Endpoint, PayloadRequest } from \"payload\";\n\nimport type { LiveRichTextField } from \"../shared/protocol.js\";\nimport type { UnsavedRichTextDepth } from \"./unsavedRichText/readAsUser.js\";\n\nimport { readUnsavedRichTextFor } from \"../readUnsavedRichText.js\";\nimport { readJsonBody } from \"./unsavedRichText/jsonBody.js\";\nimport { isPlainObject } from \"../shared/plainObject.js\";\nimport { VE_PREVIEW_GRANT_PATH, VE_UNSAVED_RICH_TEXT_PATH } from \"../shared/protocol.js\";\nimport { documentAddressOf, isVeDocument, veDocumentOf } from \"../shared/veDocument.js\";\nimport { PREVIEW_GRANT_TTL_MS, readPreviewGrant, signPreviewGrant } from \"./previewGrant.js\";\n\nexport type RenderHtml = (args: {\n value: unknown;\n field: LiveRichTextField;\n locale: string | undefined;\n req: PayloadRequest;\n}) => string | Promise<string>;\n\nexport type UnsavedRichTextEndpointOptions = {\n depth?: UnsavedRichTextDepth;\n readWholeDocument?: boolean;\n renderHtml?: RenderHtml;\n};\n\nconst MAX_BODY_BYTES = 4 * 1024 * 1024;\nexport const ENDPOINT_READ_TIME_LIMIT_MS = 8000;\nconst BODY_TIME_LIMIT_MS = 10_000;\nconst HTML_FORMAT = \"html\";\n\nconst json = (body: unknown, status: number): Response =>\n Response.json(body, { headers: { \"Cache-Control\": \"no-store\" }, status });\n\nconst jsonToAnyOrigin = (body: unknown, status: number, req: PayloadRequest): Response => {\n const origin = req.headers.get(\"Origin\");\n const headers = new Headers({ \"Cache-Control\": \"no-store\", Vary: \"Origin\" });\n if (origin) headers.set(\"Access-Control-Allow-Origin\", origin);\n return Response.json(body, { headers, status });\n};\n\nconst parsed = (text: string): unknown => {\n try {\n return JSON.parse(text);\n } catch {\n return null;\n }\n};\n\nconst bodyOf = async (req: PayloadRequest): Promise<unknown> => {\n if (Number(req.headers.get(\"Content-Length\") ?? 0) > MAX_BODY_BYTES) return null;\n if (req.body instanceof ReadableStream) {\n return readJsonBody(req as Request, MAX_BODY_BYTES, AbortSignal.timeout(BODY_TIME_LIMIT_MS));\n }\n const text = req.text ? await req.text() : \"\";\n return text.length > MAX_BODY_BYTES ? null : parsed(text);\n};\n\nconst grantEndpoint: Endpoint = {\n handler: async (req) => {\n const { user } = req;\n if (!user) return json({ grant: null }, 401);\n const body = await bodyOf(req);\n if (!isPlainObject(body) || !isVeDocument(body)) return json({ grant: null }, 400);\n\n const expiresAt = Date.now() + PREVIEW_GRANT_TTL_MS;\n const grant = signPreviewGrant(\n {\n document: documentAddressOf(veDocumentOf(body)),\n expiresAt,\n userCollection: user.collection,\n userId: user.id,\n },\n req.payload.secret\n );\n return json({ expiresAt, grant }, 200);\n },\n method: \"post\",\n path: VE_PREVIEW_GRANT_PATH,\n};\n\nconst grantedUserOf = async (req: PayloadRequest, token: unknown) => {\n const grant = readPreviewGrant(token, req.payload.secret, Date.now());\n if (!grant) return null;\n const auth = req.payload.collections[grant.userCollection]?.config.auth;\n if (!auth) return null;\n const user = await req.payload.findByID({\n collection: grant.userCollection,\n depth: auth.depth,\n disableErrors: true,\n id: grant.userId,\n overrideAccess: true,\n });\n return user\n ? { document: grant.document, user: { ...user, collection: grant.userCollection } }\n : null;\n};\n\nconst unsavedRichTextEndpoint = ({\n depth,\n readWholeDocument,\n renderHtml,\n}: UnsavedRichTextEndpointOptions): Endpoint => ({\n handler: async (req) => {\n const body = await bodyOf(req);\n if (!isPlainObject(body)) return jsonToAnyOrigin({ value: null }, 400, req);\n\n const granted = await grantedUserOf(req, body.grant);\n if (!granted) return jsonToAnyOrigin({ value: null }, 401, req);\n\n const value = await readUnsavedRichTextFor({\n allows: ({ field }) => documentAddressOf(field) === granted.document,\n depth,\n payload: req.payload,\n readWholeDocument,\n request: body.request,\n timeLimitMs: ENDPOINT_READ_TIME_LIMIT_MS,\n user: granted.user as Parameters<typeof readUnsavedRichTextFor>[0][\"user\"],\n });\n if (body.format !== HTML_FORMAT) return jsonToAnyOrigin({ value }, 200, req);\n if (value === null || !renderHtml || !isPlainObject(body.request)) {\n return jsonToAnyOrigin({ html: null }, 200, req);\n }\n\n const request = body.request as { field: LiveRichTextField; locale?: string };\n req.user = granted.user as PayloadRequest[\"user\"];\n const html = await renderHtml({ field: request.field, locale: request.locale, req, value });\n return jsonToAnyOrigin({ html }, 200, req);\n },\n method: \"post\",\n path: VE_UNSAVED_RICH_TEXT_PATH,\n});\n\nexport const visualEditingEndpoints = (options: UnsavedRichTextEndpointOptions): Endpoint[] => [\n grantEndpoint,\n unsavedRichTextEndpoint(options),\n];\n"],"names":["readUnsavedRichTextFor","readJsonBody","isPlainObject","VE_PREVIEW_GRANT_PATH","VE_UNSAVED_RICH_TEXT_PATH","documentAddressOf","isVeDocument","veDocumentOf","PREVIEW_GRANT_TTL_MS","readPreviewGrant","signPreviewGrant","MAX_BODY_BYTES","ENDPOINT_READ_TIME_LIMIT_MS","BODY_TIME_LIMIT_MS","HTML_FORMAT","json","body","status","Response","headers","jsonToAnyOrigin","req","origin","get","Headers","Vary","set","parsed","text","JSON","parse","bodyOf","Number","ReadableStream","AbortSignal","timeout","length","grantEndpoint","handler","user","grant","expiresAt","Date","now","document","userCollection","collection","userId","id","payload","secret","method","path","grantedUserOf","token","auth","collections","config","findByID","depth","disableErrors","overrideAccess","unsavedRichTextEndpoint","readWholeDocument","renderHtml","value","granted","allows","field","request","timeLimitMs","format","html","locale","visualEditingEndpoints","options"],"mappings":"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"}
|
package/dist/server/markRead.js
CHANGED
|
@@ -3,10 +3,10 @@ import { FIELD_PATH_SEPARATOR, fieldKeyOf, fieldKeyOfMarker, isRowIndex, pathOf,
|
|
|
3
3
|
import { isPlainObject } from "../shared/plainObject.js";
|
|
4
4
|
import { rootOf } from "../shared/richText/editorNodes.js";
|
|
5
5
|
import { isRichTextNodeKey } from "../shared/richText/nodeKey.js";
|
|
6
|
-
import { fieldReferenceOf, META_KEY,
|
|
6
|
+
import { fieldReferenceOf, META_KEY, toStegaPayload } from "../shared/shared.js";
|
|
7
7
|
import { withMarker } from "../shared/stegaText.js";
|
|
8
8
|
import { fieldAddressOf, idOf } from "../shared/veDocument.js";
|
|
9
|
-
import { markTextLeaves } from "
|
|
9
|
+
import { markTextLeaves } from "../shared/richText/markTextLeaves.js";
|
|
10
10
|
const NO_KEY = ()=>undefined;
|
|
11
11
|
const rowStepOf = (row)=>{
|
|
12
12
|
const id = isPlainObject(row) ? idOf(row.id) : null;
|
|
@@ -129,7 +129,7 @@ const embedText = (marking, holder, field)=>{
|
|
|
129
129
|
if (typeof current !== "string") continue;
|
|
130
130
|
if (current.trim() === "") continue;
|
|
131
131
|
if (marking.excludeValues.some((match)=>match(current))) continue;
|
|
132
|
-
holder.object[property] = withMarker(current,
|
|
132
|
+
holder.object[property] = withMarker(current, toStegaPayload(marker));
|
|
133
133
|
isEmbedded = true;
|
|
134
134
|
}
|
|
135
135
|
return isEmbedded;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/server/markRead.ts"],"sourcesContent":["import type { ValueExcludePredicate } from \"../excludeValues.js\";\nimport type { EditableSchema, HolderField } from \"../shared/editableSchema/editableSchema.js\";\nimport type { FieldStep } from \"../shared/fieldKey.js\";\nimport type { PlainObject } from \"../shared/plainObject.js\";\nimport type { VeDocument } from \"../shared/protocol.js\";\nimport type { VeIdentity } from \"../shared/shared.js\";\n\nimport { holderFieldAt } from \"../shared/editableSchema/editableSchema.js\";\nimport {\n FIELD_PATH_SEPARATOR,\n fieldKeyOf,\n fieldKeyOfMarker,\n isRowIndex,\n pathOf,\n valueAtPath,\n} from \"../shared/fieldKey.js\";\nimport { isPlainObject } from \"../shared/plainObject.js\";\nimport { rootOf } from \"../shared/richText/editorNodes.js\";\nimport { isRichTextNodeKey } from \"../shared/richText/nodeKey.js\";\nimport { fieldReferenceOf, META_KEY, veIdentityOf } from \"../shared/shared.js\";\nimport { withMarker } from \"../shared/stegaText.js\";\nimport { fieldAddressOf, idOf } from \"../shared/veDocument.js\";\nimport { markTextLeaves } from \"./richText/markTextLeaves.js\";\n\nexport type ReadOfDocument = {\n identity: VeDocument;\n schema: EditableSchema | null;\n excludeValues?: readonly ValueExcludePredicate[];\n localeCodesKeyingValues?: readonly string[];\n instantPreview?: boolean;\n};\n\ntype KeyStep = FieldStep | null;\n\ntype Place = { segments: readonly string[]; steps: readonly KeyStep[] };\n\ntype Holder = Place & { object: PlainObject };\n\ntype Holders = Map<PlainObject, Holder>;\n\ntype ValueField = Place & { field: HolderField };\n\ntype MarkedProperty = { marker: VeIdentity; property: string };\n\ntype Marking = {\n root: PlainObject;\n identity: VeDocument;\n schema: EditableSchema;\n excludeValues: readonly ValueExcludePredicate[];\n localeKeys: ReadonlySet<string>;\n keyOf: (steps: readonly KeyStep[]) => string | undefined;\n markRichText: (value: PlainObject, place: Place) => string | undefined;\n};\n\nconst NO_KEY = () => undefined;\n\nconst rowStepOf = (row: unknown): KeyStep => {\n const id = isPlainObject(row) ? idOf(row.id) : null;\n if (id === null) return null;\n const rowId = String(id);\n return rowId === \"\" || rowId.includes(FIELD_PATH_SEPARATOR) ? null : { rowId };\n};\n\nconst stableKeyOf = (steps: readonly KeyStep[]): string | undefined => {\n const knownSteps = steps.filter((step): step is FieldStep => step !== null);\n if (knownSteps.length < steps.length) return undefined;\n return knownSteps.some((step) => \"rowId\" in step) ? fieldKeyOf(knownSteps) : undefined;\n};\n\nconst hasPrimitiveValue = (object: PlainObject): boolean =>\n Object.values(object).some((value) => typeof value === \"string\" || typeof value === \"number\");\n\nconst isPayloadRow = (object: PlainObject): boolean => \"blockType\" in object || \"id\" in object;\n\nconst releaseSingleArrayOfNodes = (object: PlainObject, holders: Holders): void => {\n const isHeld = (element: PlainObject) => holders.has(element) || META_KEY in element;\n let arrayOfNodes: PlainObject[] | null = null;\n let hasOtherContainer = false;\n\n for (const child of Object.values(object)) {\n if (isPlainObject(child)) {\n hasOtherContainer = true;\n continue;\n }\n if (!Array.isArray(child)) continue;\n\n const elements = child.filter(isPlainObject);\n if (elements.length === 0) continue;\n\n if (arrayOfNodes === null && !elements.some(isPayloadRow) && elements.every(isHeld)) {\n arrayOfNodes = elements;\n } else {\n hasOtherContainer = true;\n }\n }\n\n if (arrayOfNodes === null || hasOtherContainer) return;\n for (const element of arrayOfNodes) {\n holders.delete(element);\n delete element[META_KEY];\n }\n};\n\nconst copyWithHolders = (value: unknown, place: Place, holders: Holders): unknown => {\n if (Array.isArray(value)) {\n return value.map((item, index) =>\n copyWithHolders(\n item,\n { segments: [...place.segments, String(index)], steps: [...place.steps, rowStepOf(item)] },\n holders\n )\n );\n }\n if (!isPlainObject(value) || META_KEY in value) return value;\n\n const copy: PlainObject = {};\n for (const key of Object.keys(value)) {\n copy[key] = copyWithHolders(\n value[key],\n { segments: [...place.segments, key], steps: [...place.steps, { name: key }] },\n holders\n );\n }\n if (!hasPrimitiveValue(copy)) return copy;\n\n releaseSingleArrayOfNodes(copy, holders);\n holders.set(copy, { ...place, object: copy });\n return copy;\n};\n\nconst withoutIndexes = <Item>(items: readonly Item[], indexes: readonly number[]): Item[] =>\n items.filter((_item, index) => !indexes.includes(index));\n\nconst fieldAt = ({ root, schema, localeKeys }: Marking, segments: readonly string[]) =>\n holderFieldAt(schema, root, segments, localeKeys);\n\nconst markedPropertiesOf = (\n marking: Marking,\n { object, segments, steps }: Holder,\n field: HolderField\n): MarkedProperty[] => {\n const { identity, keyOf, localeKeys } = marking;\n const pathSegments = withoutIndexes(segments, field.localeSegmentIndexes);\n const keySteps = withoutIndexes(steps, field.localeSegmentIndexes);\n\n if (field.holdsValuePerLocale && field.kind === \"text\") {\n const marker = { ...identity, key: keyOf(keySteps), path: pathOf(pathSegments) };\n return Object.keys(object)\n .filter((property) => localeKeys.has(property))\n .map((locale) => ({ marker: { ...marker, locale }, property: locale }));\n }\n\n return field.textFieldNames().map((name) => ({\n marker: {\n ...identity,\n key: keyOf([...keySteps, { name }]),\n locale: field.locale,\n path: pathOf([...pathSegments, name]),\n },\n property: name,\n }));\n};\n\nconst embedText = (marking: Marking, holder: Holder, field: HolderField): boolean => {\n let isEmbedded = false;\n for (const { marker, property } of markedPropertiesOf(marking, holder, field)) {\n const current = holder.object[property];\n if (typeof current !== \"string\") continue;\n if (current.trim() === \"\") continue;\n if (marking.excludeValues.some((match) => match(current))) continue;\n holder.object[property] = withMarker(current, veIdentityOf(marker));\n isEmbedded = true;\n }\n return isEmbedded;\n};\n\nconst isValueField = (field: HolderField | null): field is HolderField =>\n field?.kind === \"richText\" || field?.kind === \"value\";\n\nconst nearestValueField = (\n marking: Marking,\n { segments, steps }: Place,\n field: HolderField | null\n): ValueField | null => {\n if (isValueField(field)) return { field, segments, steps };\n if (segments.length === 0) return null;\n\n const above = { segments: segments.slice(0, -1), steps: steps.slice(0, -1) };\n return nearestValueField(marking, above, fieldAt(marking, above.segments));\n};\n\nconst isValueOfSeveralCollections = (value: PlainObject): boolean =>\n typeof value.relationTo === \"string\" && isPlainObject(value.value);\n\nconst valuesOfField = (value: unknown): PlainObject[] => {\n if (!isPlainObject(value)) return [];\n return isValueOfSeveralCollections(value) ? [value, value.value as PlainObject] : [value];\n};\n\nconst withoutRowOfManyValues = (segments: readonly string[]): readonly string[] =>\n isRowIndex(segments.at(-1) ?? \"\") ? segments.slice(0, -1) : segments;\n\nconst referenceField = (marking: Marking, { field, ...place }: ValueField): void => {\n const fieldPath = pathOf(\n withoutRowOfManyValues(withoutIndexes(place.segments, field.localeSegmentIndexes))\n );\n for (const value of valuesOfField(valueAtPath(marking.root, place.segments)?.value)) {\n const key = field.kind === \"richText\" ? marking.markRichText(value, place) : undefined;\n value[META_KEY] = fieldReferenceOf({\n ...marking.identity,\n key,\n locale: field.locale,\n path: fieldPath,\n });\n }\n};\n\nconst resolveHolder = (marking: Marking, holder: Holder): void => {\n delete holder.object[META_KEY];\n const field = fieldAt(marking, holder.segments);\n if (field !== null && embedText(marking, holder, field)) return;\n\n const valueField = nearestValueField(marking, holder, field);\n if (valueField) referenceField(marking, valueField);\n};\n\nconst richTextMarker = (identity: VeDocument) => {\n const keyByValue = new Map<PlainObject, string | undefined>();\n\n const markLeaves = (value: PlainObject, { segments, steps }: Place): string | undefined => {\n const key = stableKeyOf(steps);\n const fieldKey = fieldKeyOfMarker({ key, path: pathOf(segments) });\n if (fieldKey === null || isRichTextNodeKey(fieldKey)) return undefined;\n\n markTextLeaves(value, fieldAddressOf(identity, fieldKey));\n return key;\n };\n\n return (value: PlainObject, place: Place): string | undefined => {\n if (rootOf(value) === null) return undefined;\n if (!keyByValue.has(value)) keyByValue.set(value, markLeaves(value, place));\n return keyByValue.get(value);\n };\n};\n\nexport const markRead = <Document extends PlainObject>(\n document: Document,\n {\n identity,\n schema,\n excludeValues = [],\n localeCodesKeyingValues = [],\n instantPreview = false,\n }: ReadOfDocument\n): Document => {\n const holders: Holders = new Map();\n const root = copyWithHolders(document, { segments: [], steps: [] }, holders) as Document;\n if (schema === null) return root;\n\n const localeKeys = new Set(localeCodesKeyingValues);\n const marking: Marking = {\n identity,\n excludeValues,\n keyOf: instantPreview ? stableKeyOf : NO_KEY,\n localeKeys,\n markRichText: instantPreview && localeKeys.size === 0 ? richTextMarker(identity) : NO_KEY,\n root,\n schema,\n };\n for (const holder of holders.values()) resolveHolder(marking, holder);\n return root;\n};\n"],"names":["holderFieldAt","FIELD_PATH_SEPARATOR","fieldKeyOf","fieldKeyOfMarker","isRowIndex","pathOf","valueAtPath","isPlainObject","rootOf","isRichTextNodeKey","fieldReferenceOf","META_KEY","veIdentityOf","withMarker","fieldAddressOf","idOf","markTextLeaves","NO_KEY","undefined","rowStepOf","row","id","rowId","String","includes","stableKeyOf","steps","knownSteps","filter","step","length","some","hasPrimitiveValue","object","Object","values","value","isPayloadRow","releaseSingleArrayOfNodes","holders","isHeld","element","has","arrayOfNodes","hasOtherContainer","child","Array","isArray","elements","every","delete","copyWithHolders","place","map","item","index","segments","copy","key","keys","name","set","withoutIndexes","items","indexes","_item","fieldAt","root","schema","localeKeys","markedPropertiesOf","marking","field","identity","keyOf","pathSegments","localeSegmentIndexes","keySteps","holdsValuePerLocale","kind","marker","path","property","locale","textFieldNames","embedText","holder","isEmbedded","current","trim","excludeValues","match","isValueField","nearestValueField","above","slice","isValueOfSeveralCollections","relationTo","valuesOfField","withoutRowOfManyValues","at","referenceField","fieldPath","markRichText","resolveHolder","valueField","richTextMarker","keyByValue","Map","markLeaves","fieldKey","get","markRead","document","localeCodesKeyingValues","instantPreview","Set","size"],"mappings":"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"}
|
|
1
|
+
{"version":3,"sources":["../../src/server/markRead.ts"],"sourcesContent":["import type { ValueExcludePredicate } from \"../excludeValues.js\";\nimport type { EditableSchema, HolderField } from \"../shared/editableSchema/editableSchema.js\";\nimport type { FieldStep } from \"../shared/fieldKey.js\";\nimport type { PlainObject } from \"../shared/plainObject.js\";\nimport type { VeDocument } from \"../shared/protocol.js\";\nimport type { VeIdentity } from \"../shared/shared.js\";\n\nimport { holderFieldAt } from \"../shared/editableSchema/editableSchema.js\";\nimport {\n FIELD_PATH_SEPARATOR,\n fieldKeyOf,\n fieldKeyOfMarker,\n isRowIndex,\n pathOf,\n valueAtPath,\n} from \"../shared/fieldKey.js\";\nimport { isPlainObject } from \"../shared/plainObject.js\";\nimport { rootOf } from \"../shared/richText/editorNodes.js\";\nimport { isRichTextNodeKey } from \"../shared/richText/nodeKey.js\";\nimport { fieldReferenceOf, META_KEY, toStegaPayload } from \"../shared/shared.js\";\nimport { withMarker } from \"../shared/stegaText.js\";\nimport { fieldAddressOf, idOf } from \"../shared/veDocument.js\";\nimport { markTextLeaves } from \"../shared/richText/markTextLeaves.js\";\n\nexport type ReadOfDocument = {\n identity: VeDocument;\n schema: EditableSchema | null;\n excludeValues?: readonly ValueExcludePredicate[];\n localeCodesKeyingValues?: readonly string[];\n instantPreview?: boolean;\n};\n\ntype KeyStep = FieldStep | null;\n\ntype Place = { segments: readonly string[]; steps: readonly KeyStep[] };\n\ntype Holder = Place & { object: PlainObject };\n\ntype Holders = Map<PlainObject, Holder>;\n\ntype ValueField = Place & { field: HolderField };\n\ntype MarkedProperty = { marker: VeIdentity; property: string };\n\ntype Marking = {\n root: PlainObject;\n identity: VeDocument;\n schema: EditableSchema;\n excludeValues: readonly ValueExcludePredicate[];\n localeKeys: ReadonlySet<string>;\n keyOf: (steps: readonly KeyStep[]) => string | undefined;\n markRichText: (value: PlainObject, place: Place) => string | undefined;\n};\n\nconst NO_KEY = () => undefined;\n\nconst rowStepOf = (row: unknown): KeyStep => {\n const id = isPlainObject(row) ? idOf(row.id) : null;\n if (id === null) return null;\n const rowId = String(id);\n return rowId === \"\" || rowId.includes(FIELD_PATH_SEPARATOR) ? null : { rowId };\n};\n\nconst stableKeyOf = (steps: readonly KeyStep[]): string | undefined => {\n const knownSteps = steps.filter((step): step is FieldStep => step !== null);\n if (knownSteps.length < steps.length) return undefined;\n return knownSteps.some((step) => \"rowId\" in step) ? fieldKeyOf(knownSteps) : undefined;\n};\n\nconst hasPrimitiveValue = (object: PlainObject): boolean =>\n Object.values(object).some((value) => typeof value === \"string\" || typeof value === \"number\");\n\nconst isPayloadRow = (object: PlainObject): boolean => \"blockType\" in object || \"id\" in object;\n\nconst releaseSingleArrayOfNodes = (object: PlainObject, holders: Holders): void => {\n const isHeld = (element: PlainObject) => holders.has(element) || META_KEY in element;\n let arrayOfNodes: PlainObject[] | null = null;\n let hasOtherContainer = false;\n\n for (const child of Object.values(object)) {\n if (isPlainObject(child)) {\n hasOtherContainer = true;\n continue;\n }\n if (!Array.isArray(child)) continue;\n\n const elements = child.filter(isPlainObject);\n if (elements.length === 0) continue;\n\n if (arrayOfNodes === null && !elements.some(isPayloadRow) && elements.every(isHeld)) {\n arrayOfNodes = elements;\n } else {\n hasOtherContainer = true;\n }\n }\n\n if (arrayOfNodes === null || hasOtherContainer) return;\n for (const element of arrayOfNodes) {\n holders.delete(element);\n delete element[META_KEY];\n }\n};\n\nconst copyWithHolders = (value: unknown, place: Place, holders: Holders): unknown => {\n if (Array.isArray(value)) {\n return value.map((item, index) =>\n copyWithHolders(\n item,\n { segments: [...place.segments, String(index)], steps: [...place.steps, rowStepOf(item)] },\n holders\n )\n );\n }\n if (!isPlainObject(value) || META_KEY in value) return value;\n\n const copy: PlainObject = {};\n for (const key of Object.keys(value)) {\n copy[key] = copyWithHolders(\n value[key],\n { segments: [...place.segments, key], steps: [...place.steps, { name: key }] },\n holders\n );\n }\n if (!hasPrimitiveValue(copy)) return copy;\n\n releaseSingleArrayOfNodes(copy, holders);\n holders.set(copy, { ...place, object: copy });\n return copy;\n};\n\nconst withoutIndexes = <Item>(items: readonly Item[], indexes: readonly number[]): Item[] =>\n items.filter((_item, index) => !indexes.includes(index));\n\nconst fieldAt = ({ root, schema, localeKeys }: Marking, segments: readonly string[]) =>\n holderFieldAt(schema, root, segments, localeKeys);\n\nconst markedPropertiesOf = (\n marking: Marking,\n { object, segments, steps }: Holder,\n field: HolderField\n): MarkedProperty[] => {\n const { identity, keyOf, localeKeys } = marking;\n const pathSegments = withoutIndexes(segments, field.localeSegmentIndexes);\n const keySteps = withoutIndexes(steps, field.localeSegmentIndexes);\n\n if (field.holdsValuePerLocale && field.kind === \"text\") {\n const marker = { ...identity, key: keyOf(keySteps), path: pathOf(pathSegments) };\n return Object.keys(object)\n .filter((property) => localeKeys.has(property))\n .map((locale) => ({ marker: { ...marker, locale }, property: locale }));\n }\n\n return field.textFieldNames().map((name) => ({\n marker: {\n ...identity,\n key: keyOf([...keySteps, { name }]),\n locale: field.locale,\n path: pathOf([...pathSegments, name]),\n },\n property: name,\n }));\n};\n\nconst embedText = (marking: Marking, holder: Holder, field: HolderField): boolean => {\n let isEmbedded = false;\n for (const { marker, property } of markedPropertiesOf(marking, holder, field)) {\n const current = holder.object[property];\n if (typeof current !== \"string\") continue;\n if (current.trim() === \"\") continue;\n if (marking.excludeValues.some((match) => match(current))) continue;\n holder.object[property] = withMarker(current, toStegaPayload(marker));\n isEmbedded = true;\n }\n return isEmbedded;\n};\n\nconst isValueField = (field: HolderField | null): field is HolderField =>\n field?.kind === \"richText\" || field?.kind === \"value\";\n\nconst nearestValueField = (\n marking: Marking,\n { segments, steps }: Place,\n field: HolderField | null\n): ValueField | null => {\n if (isValueField(field)) return { field, segments, steps };\n if (segments.length === 0) return null;\n\n const above = { segments: segments.slice(0, -1), steps: steps.slice(0, -1) };\n return nearestValueField(marking, above, fieldAt(marking, above.segments));\n};\n\nconst isValueOfSeveralCollections = (value: PlainObject): boolean =>\n typeof value.relationTo === \"string\" && isPlainObject(value.value);\n\nconst valuesOfField = (value: unknown): PlainObject[] => {\n if (!isPlainObject(value)) return [];\n return isValueOfSeveralCollections(value) ? [value, value.value as PlainObject] : [value];\n};\n\nconst withoutRowOfManyValues = (segments: readonly string[]): readonly string[] =>\n isRowIndex(segments.at(-1) ?? \"\") ? segments.slice(0, -1) : segments;\n\nconst referenceField = (marking: Marking, { field, ...place }: ValueField): void => {\n const fieldPath = pathOf(\n withoutRowOfManyValues(withoutIndexes(place.segments, field.localeSegmentIndexes))\n );\n for (const value of valuesOfField(valueAtPath(marking.root, place.segments)?.value)) {\n const key = field.kind === \"richText\" ? marking.markRichText(value, place) : undefined;\n value[META_KEY] = fieldReferenceOf({\n ...marking.identity,\n key,\n locale: field.locale,\n path: fieldPath,\n });\n }\n};\n\nconst resolveHolder = (marking: Marking, holder: Holder): void => {\n delete holder.object[META_KEY];\n const field = fieldAt(marking, holder.segments);\n if (field !== null && embedText(marking, holder, field)) return;\n\n const valueField = nearestValueField(marking, holder, field);\n if (valueField) referenceField(marking, valueField);\n};\n\nconst richTextMarker = (identity: VeDocument) => {\n const keyByValue = new Map<PlainObject, string | undefined>();\n\n const markLeaves = (value: PlainObject, { segments, steps }: Place): string | undefined => {\n const key = stableKeyOf(steps);\n const fieldKey = fieldKeyOfMarker({ key, path: pathOf(segments) });\n if (fieldKey === null || isRichTextNodeKey(fieldKey)) return undefined;\n\n markTextLeaves(value, fieldAddressOf(identity, fieldKey));\n return key;\n };\n\n return (value: PlainObject, place: Place): string | undefined => {\n if (rootOf(value) === null) return undefined;\n if (!keyByValue.has(value)) keyByValue.set(value, markLeaves(value, place));\n return keyByValue.get(value);\n };\n};\n\nexport const markRead = <Document extends PlainObject>(\n document: Document,\n {\n identity,\n schema,\n excludeValues = [],\n localeCodesKeyingValues = [],\n instantPreview = false,\n }: ReadOfDocument\n): Document => {\n const holders: Holders = new Map();\n const root = copyWithHolders(document, { segments: [], steps: [] }, holders) as Document;\n if (schema === null) return root;\n\n const localeKeys = new Set(localeCodesKeyingValues);\n const marking: Marking = {\n identity,\n excludeValues,\n keyOf: instantPreview ? stableKeyOf : NO_KEY,\n localeKeys,\n markRichText: instantPreview && localeKeys.size === 0 ? richTextMarker(identity) : NO_KEY,\n root,\n schema,\n };\n for (const holder of holders.values()) resolveHolder(marking, holder);\n return root;\n};\n"],"names":["holderFieldAt","FIELD_PATH_SEPARATOR","fieldKeyOf","fieldKeyOfMarker","isRowIndex","pathOf","valueAtPath","isPlainObject","rootOf","isRichTextNodeKey","fieldReferenceOf","META_KEY","toStegaPayload","withMarker","fieldAddressOf","idOf","markTextLeaves","NO_KEY","undefined","rowStepOf","row","id","rowId","String","includes","stableKeyOf","steps","knownSteps","filter","step","length","some","hasPrimitiveValue","object","Object","values","value","isPayloadRow","releaseSingleArrayOfNodes","holders","isHeld","element","has","arrayOfNodes","hasOtherContainer","child","Array","isArray","elements","every","delete","copyWithHolders","place","map","item","index","segments","copy","key","keys","name","set","withoutIndexes","items","indexes","_item","fieldAt","root","schema","localeKeys","markedPropertiesOf","marking","field","identity","keyOf","pathSegments","localeSegmentIndexes","keySteps","holdsValuePerLocale","kind","marker","path","property","locale","textFieldNames","embedText","holder","isEmbedded","current","trim","excludeValues","match","isValueField","nearestValueField","above","slice","isValueOfSeveralCollections","relationTo","valuesOfField","withoutRowOfManyValues","at","referenceField","fieldPath","markRichText","resolveHolder","valueField","richTextMarker","keyByValue","Map","markLeaves","fieldKey","get","markRead","document","localeCodesKeyingValues","instantPreview","Set","size"],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export type MarkedReadsOptions = {
|
|
|
4
4
|
adminBasePath: string;
|
|
5
5
|
enrichment: Enrichment;
|
|
6
6
|
};
|
|
7
|
-
export type MarkedReadRequest = Pick<PayloadRequest, "context" | "pathname" | "payloadAPI">;
|
|
7
|
+
export type MarkedReadRequest = Pick<PayloadRequest, "context" | "headers" | "pathname" | "payloadAPI" | "user">;
|
|
8
8
|
type Operation = {
|
|
9
9
|
operation: string;
|
|
10
10
|
args: unknown;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { VE_READ_HEADER } from "../shared/protocol.js";
|
|
1
2
|
const COLLECTION_DRAFT_READS = new Set([
|
|
2
3
|
"find",
|
|
3
4
|
"findByID"
|
|
@@ -36,8 +37,9 @@ export const createMarkedReads = ({ adminBasePath, enrichment })=>{
|
|
|
36
37
|
const isMarked = (req, isDraftRead)=>{
|
|
37
38
|
const override = req.context?.visualEditing;
|
|
38
39
|
if (typeof override === "boolean") return override;
|
|
39
|
-
if (
|
|
40
|
-
|
|
40
|
+
if (!isDraftRead || isUnderAdmin(req, adminBasePath)) return false;
|
|
41
|
+
if (req.payloadAPI === "local") return enrichment === "auto";
|
|
42
|
+
return req.headers.has(VE_READ_HEADER) && req.user !== null;
|
|
41
43
|
};
|
|
42
44
|
return {
|
|
43
45
|
isCollectionReadMarked: ({ args, operation, req })=>{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/server/markedReads.ts"],"sourcesContent":["import type { PayloadRequest } from \"payload\";\n\nexport type Enrichment = \"auto\" | \"explicit\";\n\nexport type MarkedReadsOptions = {\n adminBasePath: string;\n enrichment: Enrichment;\n};\n\nexport type MarkedReadRequest = Pick
|
|
1
|
+
{"version":3,"sources":["../../src/server/markedReads.ts"],"sourcesContent":["import type { PayloadRequest } from \"payload\";\n\nimport { VE_READ_HEADER } from \"../shared/protocol.js\";\n\nexport type Enrichment = \"auto\" | \"explicit\";\n\nexport type MarkedReadsOptions = {\n adminBasePath: string;\n enrichment: Enrichment;\n};\n\nexport type MarkedReadRequest = Pick<\n PayloadRequest,\n \"context\" | \"headers\" | \"pathname\" | \"payloadAPI\" | \"user\"\n>;\n\ntype Operation = { operation: string; args: unknown; req: MarkedReadRequest };\n\ntype GlobalOperation = Operation & { slug: string };\n\ntype GlobalRead = { slug: string; req: MarkedReadRequest; query?: unknown; findMany?: unknown };\n\ntype OpenReads = { draft: number; other: number };\n\nconst COLLECTION_DRAFT_READS = new Set([\"find\", \"findByID\"]);\nconst COLLECTION_VERSION_READS = new Set([\"findVersions\", \"findVersionByID\"]);\nconst GLOBAL_DRAFT_READ = \"read\";\nconst GLOBAL_UNREAD_OPERATIONS = new Set([\"countVersions\"]);\n\nconst asksForDraft = (args: unknown): boolean =>\n typeof args === \"object\" && args !== null && (args as { draft?: unknown }).draft === true;\n\nexport const isCollectionVersionRead = (operation: string): boolean =>\n COLLECTION_VERSION_READS.has(operation);\n\nconst isGlobalVersionRead = (read: GlobalRead): boolean =>\n Object.hasOwn(read, \"query\") || Object.hasOwn(read, \"findMany\");\n\nconst isUnderAdmin = (req: MarkedReadRequest, adminBasePath: string): boolean =>\n (req.pathname ?? \"\").startsWith(adminBasePath);\n\nexport const createMarkedReads = ({ adminBasePath, enrichment }: MarkedReadsOptions) => {\n const openReadsByRequest = new WeakMap<MarkedReadRequest, Map<string, OpenReads>>();\n\n const openReadsOf = (req: MarkedReadRequest, slug: string): OpenReads => {\n const bySlug = openReadsByRequest.get(req) ?? new Map<string, OpenReads>();\n openReadsByRequest.set(req, bySlug);\n const reads = bySlug.get(slug) ?? { draft: 0, other: 0 };\n bySlug.set(slug, reads);\n return reads;\n };\n\n const closeOpenRead = (req: MarkedReadRequest, slug: string): boolean => {\n const reads = openReadsOf(req, slug);\n const isOnlyDraftReadOpen = reads.other === 0 && reads.draft > 0;\n if (reads.draft > 0) reads.draft -= 1;\n else if (reads.other > 0) reads.other -= 1;\n return isOnlyDraftReadOpen;\n };\n\n const isMarked = (req: MarkedReadRequest, isDraftRead: boolean): boolean => {\n const override = req.context?.visualEditing;\n if (typeof override === \"boolean\") return override;\n if (!isDraftRead || isUnderAdmin(req, adminBasePath)) return false;\n if (req.payloadAPI === \"local\") return enrichment === \"auto\";\n return req.headers.has(VE_READ_HEADER) && req.user !== null;\n };\n\n return {\n isCollectionReadMarked: ({ args, operation, req }: Operation): boolean => {\n const isDocumentRead = COLLECTION_DRAFT_READS.has(operation);\n if (!isDocumentRead && !isCollectionVersionRead(operation)) return false;\n return isMarked(req, isDocumentRead && asksForDraft(args));\n },\n closeGlobalRead: (read: GlobalRead): boolean =>\n isMarked(read.req, !isGlobalVersionRead(read) && closeOpenRead(read.req, read.slug)),\n openGlobalRead: ({ args, operation, req, slug }: GlobalOperation): void => {\n if (GLOBAL_UNREAD_OPERATIONS.has(operation)) return;\n const reads = openReadsOf(req, slug);\n if (operation === GLOBAL_DRAFT_READ && asksForDraft(args)) reads.draft += 1;\n else reads.other += 1;\n },\n };\n};\n"],"names":["VE_READ_HEADER","COLLECTION_DRAFT_READS","Set","COLLECTION_VERSION_READS","GLOBAL_DRAFT_READ","GLOBAL_UNREAD_OPERATIONS","asksForDraft","args","draft","isCollectionVersionRead","operation","has","isGlobalVersionRead","read","Object","hasOwn","isUnderAdmin","req","adminBasePath","pathname","startsWith","createMarkedReads","enrichment","openReadsByRequest","WeakMap","openReadsOf","slug","bySlug","get","Map","set","reads","other","closeOpenRead","isOnlyDraftReadOpen","isMarked","isDraftRead","override","context","visualEditing","payloadAPI","headers","user","isCollectionReadMarked","isDocumentRead","closeGlobalRead","openGlobalRead"],"mappings":"AAEA,SAASA,cAAc,QAAQ,wBAAwB;AAsBvD,MAAMC,yBAAyB,IAAIC,IAAI;IAAC;IAAQ;CAAW;AAC3D,MAAMC,2BAA2B,IAAID,IAAI;IAAC;IAAgB;CAAkB;AAC5E,MAAME,oBAAoB;AAC1B,MAAMC,2BAA2B,IAAIH,IAAI;IAAC;CAAgB;AAE1D,MAAMI,eAAe,CAACC,OACpB,OAAOA,SAAS,YAAYA,SAAS,QAAQ,AAACA,KAA6BC,KAAK,KAAK;AAEvF,OAAO,MAAMC,0BAA0B,CAACC,YACtCP,yBAAyBQ,GAAG,CAACD,WAAW;AAE1C,MAAME,sBAAsB,CAACC,OAC3BC,OAAOC,MAAM,CAACF,MAAM,YAAYC,OAAOC,MAAM,CAACF,MAAM;AAEtD,MAAMG,eAAe,CAACC,KAAwBC,gBAC5C,AAACD,CAAAA,IAAIE,QAAQ,IAAI,EAAC,EAAGC,UAAU,CAACF;AAElC,OAAO,MAAMG,oBAAoB,CAAC,EAAEH,aAAa,EAAEI,UAAU,EAAsB;IACjF,MAAMC,qBAAqB,IAAIC;IAE/B,MAAMC,cAAc,CAACR,KAAwBS;QAC3C,MAAMC,SAASJ,mBAAmBK,GAAG,CAACX,QAAQ,IAAIY;QAClDN,mBAAmBO,GAAG,CAACb,KAAKU;QAC5B,MAAMI,QAAQJ,OAAOC,GAAG,CAACF,SAAS;YAAElB,OAAO;YAAGwB,OAAO;QAAE;QACvDL,OAAOG,GAAG,CAACJ,MAAMK;QACjB,OAAOA;IACT;IAEA,MAAME,gBAAgB,CAAChB,KAAwBS;QAC7C,MAAMK,QAAQN,YAAYR,KAAKS;QAC/B,MAAMQ,sBAAsBH,MAAMC,KAAK,KAAK,KAAKD,MAAMvB,KAAK,GAAG;QAC/D,IAAIuB,MAAMvB,KAAK,GAAG,GAAGuB,MAAMvB,KAAK,IAAI;aAC/B,IAAIuB,MAAMC,KAAK,GAAG,GAAGD,MAAMC,KAAK,IAAI;QACzC,OAAOE;IACT;IAEA,MAAMC,WAAW,CAAClB,KAAwBmB;QACxC,MAAMC,WAAWpB,IAAIqB,OAAO,EAAEC;QAC9B,IAAI,OAAOF,aAAa,WAAW,OAAOA;QAC1C,IAAI,CAACD,eAAepB,aAAaC,KAAKC,gBAAgB,OAAO;QAC7D,IAAID,IAAIuB,UAAU,KAAK,SAAS,OAAOlB,eAAe;QACtD,OAAOL,IAAIwB,OAAO,CAAC9B,GAAG,CAACX,mBAAmBiB,IAAIyB,IAAI,KAAK;IACzD;IAEA,OAAO;QACLC,wBAAwB,CAAC,EAAEpC,IAAI,EAAEG,SAAS,EAAEO,GAAG,EAAa;YAC1D,MAAM2B,iBAAiB3C,uBAAuBU,GAAG,CAACD;YAClD,IAAI,CAACkC,kBAAkB,CAACnC,wBAAwBC,YAAY,OAAO;YACnE,OAAOyB,SAASlB,KAAK2B,kBAAkBtC,aAAaC;QACtD;QACAsC,iBAAiB,CAAChC,OAChBsB,SAAStB,KAAKI,GAAG,EAAE,CAACL,oBAAoBC,SAASoB,cAAcpB,KAAKI,GAAG,EAAEJ,KAAKa,IAAI;QACpFoB,gBAAgB,CAAC,EAAEvC,IAAI,EAAEG,SAAS,EAAEO,GAAG,EAAES,IAAI,EAAmB;YAC9D,IAAIrB,yBAAyBM,GAAG,CAACD,YAAY;YAC7C,MAAMqB,QAAQN,YAAYR,KAAKS;YAC/B,IAAIhB,cAAcN,qBAAqBE,aAAaC,OAAOwB,MAAMvB,KAAK,IAAI;iBACrEuB,MAAMC,KAAK,IAAI;QACtB;IACF;AACF,EAAE"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
export declare const PREVIEW_GRANT_TTL_MS: number;
|
|
2
|
+
export type PreviewGrant = {
|
|
3
|
+
document: string;
|
|
4
|
+
expiresAt: number;
|
|
5
|
+
userCollection: string;
|
|
6
|
+
userId: number | string;
|
|
7
|
+
};
|
|
8
|
+
export declare const signPreviewGrant: (grant: PreviewGrant, secret: string) => string;
|
|
9
|
+
export declare const readPreviewGrant: (token: unknown, secret: string, now: number) => PreviewGrant | null;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { createHmac, timingSafeEqual } from "node:crypto";
|
|
2
|
+
import { isPlainObject } from "../shared/plainObject.js";
|
|
3
|
+
export const PREVIEW_GRANT_TTL_MS = 10 * 60 * 1000;
|
|
4
|
+
const SEPARATOR = ".";
|
|
5
|
+
const KEY_LABEL = "visual-editing/preview-grant/v1";
|
|
6
|
+
const keyOf = (secret)=>createHmac("sha256", secret).update(KEY_LABEL).digest();
|
|
7
|
+
const signatureOf = (payload, secret)=>createHmac("sha256", keyOf(secret)).update(payload).digest();
|
|
8
|
+
const isGrant = (value)=>isPlainObject(value) && typeof value.document === "string" && typeof value.expiresAt === "number" && typeof value.userCollection === "string" && (typeof value.userId === "string" || typeof value.userId === "number");
|
|
9
|
+
export const signPreviewGrant = (grant, secret)=>{
|
|
10
|
+
const payload = Buffer.from(JSON.stringify(grant)).toString("base64url");
|
|
11
|
+
return `${payload}${SEPARATOR}${signatureOf(payload, secret).toString("base64url")}`;
|
|
12
|
+
};
|
|
13
|
+
const parse = (payload)=>{
|
|
14
|
+
try {
|
|
15
|
+
return JSON.parse(Buffer.from(payload, "base64url").toString());
|
|
16
|
+
} catch {
|
|
17
|
+
return null;
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
export const readPreviewGrant = (token, secret, now)=>{
|
|
21
|
+
if (typeof token !== "string") return null;
|
|
22
|
+
const [payload, signature, ...rest] = token.split(SEPARATOR);
|
|
23
|
+
if (!payload || !signature || rest.length > 0) return null;
|
|
24
|
+
const expected = signatureOf(payload, secret);
|
|
25
|
+
const actual = Buffer.from(signature, "base64url");
|
|
26
|
+
if (actual.length !== expected.length || !timingSafeEqual(actual, expected)) return null;
|
|
27
|
+
const grant = parse(payload);
|
|
28
|
+
return isGrant(grant) && grant.expiresAt > now ? grant : null;
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
//# sourceMappingURL=previewGrant.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/server/previewGrant.ts"],"sourcesContent":["import { createHmac, timingSafeEqual } from \"node:crypto\";\n\nimport { isPlainObject } from \"../shared/plainObject.js\";\n\nexport const PREVIEW_GRANT_TTL_MS = 10 * 60 * 1000;\n\nexport type PreviewGrant = {\n document: string;\n expiresAt: number;\n userCollection: string;\n userId: number | string;\n};\n\nconst SEPARATOR = \".\";\n\nconst KEY_LABEL = \"visual-editing/preview-grant/v1\";\n\nconst keyOf = (secret: string): Buffer => createHmac(\"sha256\", secret).update(KEY_LABEL).digest();\n\nconst signatureOf = (payload: string, secret: string): Buffer =>\n createHmac(\"sha256\", keyOf(secret)).update(payload).digest();\n\nconst isGrant = (value: unknown): value is PreviewGrant =>\n isPlainObject(value) &&\n typeof value.document === \"string\" &&\n typeof value.expiresAt === \"number\" &&\n typeof value.userCollection === \"string\" &&\n (typeof value.userId === \"string\" || typeof value.userId === \"number\");\n\nexport const signPreviewGrant = (grant: PreviewGrant, secret: string): string => {\n const payload = Buffer.from(JSON.stringify(grant)).toString(\"base64url\");\n return `${payload}${SEPARATOR}${signatureOf(payload, secret).toString(\"base64url\")}`;\n};\n\nconst parse = (payload: string): unknown => {\n try {\n return JSON.parse(Buffer.from(payload, \"base64url\").toString());\n } catch {\n return null;\n }\n};\n\nexport const readPreviewGrant = (\n token: unknown,\n secret: string,\n now: number\n): PreviewGrant | null => {\n if (typeof token !== \"string\") return null;\n const [payload, signature, ...rest] = token.split(SEPARATOR);\n if (!payload || !signature || rest.length > 0) return null;\n\n const expected = signatureOf(payload, secret);\n const actual = Buffer.from(signature, \"base64url\");\n if (actual.length !== expected.length || !timingSafeEqual(actual, expected)) return null;\n\n const grant = parse(payload);\n return isGrant(grant) && grant.expiresAt > now ? grant : null;\n};\n"],"names":["createHmac","timingSafeEqual","isPlainObject","PREVIEW_GRANT_TTL_MS","SEPARATOR","KEY_LABEL","keyOf","secret","update","digest","signatureOf","payload","isGrant","value","document","expiresAt","userCollection","userId","signPreviewGrant","grant","Buffer","from","JSON","stringify","toString","parse","readPreviewGrant","token","now","signature","rest","split","length","expected","actual"],"mappings":"AAAA,SAASA,UAAU,EAAEC,eAAe,QAAQ,cAAc;AAE1D,SAASC,aAAa,QAAQ,2BAA2B;AAEzD,OAAO,MAAMC,uBAAuB,KAAK,KAAK,KAAK;AASnD,MAAMC,YAAY;AAElB,MAAMC,YAAY;AAElB,MAAMC,QAAQ,CAACC,SAA2BP,WAAW,UAAUO,QAAQC,MAAM,CAACH,WAAWI,MAAM;AAE/F,MAAMC,cAAc,CAACC,SAAiBJ,SACpCP,WAAW,UAAUM,MAAMC,SAASC,MAAM,CAACG,SAASF,MAAM;AAE5D,MAAMG,UAAU,CAACC,QACfX,cAAcW,UACd,OAAOA,MAAMC,QAAQ,KAAK,YAC1B,OAAOD,MAAME,SAAS,KAAK,YAC3B,OAAOF,MAAMG,cAAc,KAAK,YAC/B,CAAA,OAAOH,MAAMI,MAAM,KAAK,YAAY,OAAOJ,MAAMI,MAAM,KAAK,QAAO;AAEtE,OAAO,MAAMC,mBAAmB,CAACC,OAAqBZ;IACpD,MAAMI,UAAUS,OAAOC,IAAI,CAACC,KAAKC,SAAS,CAACJ,QAAQK,QAAQ,CAAC;IAC5D,OAAO,CAAC,EAAEb,QAAQ,EAAEP,UAAU,EAAEM,YAAYC,SAASJ,QAAQiB,QAAQ,CAAC,aAAa,CAAC;AACtF,EAAE;AAEF,MAAMC,QAAQ,CAACd;IACb,IAAI;QACF,OAAOW,KAAKG,KAAK,CAACL,OAAOC,IAAI,CAACV,SAAS,aAAaa,QAAQ;IAC9D,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,OAAO,MAAME,mBAAmB,CAC9BC,OACApB,QACAqB;IAEA,IAAI,OAAOD,UAAU,UAAU,OAAO;IACtC,MAAM,CAAChB,SAASkB,WAAW,GAAGC,KAAK,GAAGH,MAAMI,KAAK,CAAC3B;IAClD,IAAI,CAACO,WAAW,CAACkB,aAAaC,KAAKE,MAAM,GAAG,GAAG,OAAO;IAEtD,MAAMC,WAAWvB,YAAYC,SAASJ;IACtC,MAAM2B,SAASd,OAAOC,IAAI,CAACQ,WAAW;IACtC,IAAIK,OAAOF,MAAM,KAAKC,SAASD,MAAM,IAAI,CAAC/B,gBAAgBiC,QAAQD,WAAW,OAAO;IAEpF,MAAMd,QAAQM,MAAMd;IACpB,OAAOC,QAAQO,UAAUA,MAAMJ,SAAS,GAAGa,MAAMT,QAAQ;AAC3D,EAAE"}
|
|
@@ -1,18 +1,33 @@
|
|
|
1
1
|
import { localeOf } from "../localeCodesKeyingValues.js";
|
|
2
2
|
import { collectionDocumentOf, documentAddressOf } from "../../shared/veDocument.js";
|
|
3
3
|
import { placeUnsavedState } from "./placeUnsavedState.js";
|
|
4
|
-
import { unsavedRichTextOf } from "./readContext.js";
|
|
5
|
-
|
|
4
|
+
import { savedReferencesOnlyOf, unsavedRichTextOf } from "./readContext.js";
|
|
5
|
+
import { isPrivateCollectionOf, withOnlyReferencesOf } from "./savedReferences.js";
|
|
6
|
+
import { richTextValueAt } from "../../shared/editableSchema/editableSchema.js";
|
|
7
|
+
const isReadOf = ({ document, overrideAccess }, field)=>field !== undefined && overrideAccess === false && documentAddressOf(field) === documentAddressOf(document);
|
|
8
|
+
const placeIntoReadDocument = (read, schemaCache)=>{
|
|
9
|
+
const { document, req, stored } = read;
|
|
6
10
|
const unsaved = unsavedRichTextOf(req.context);
|
|
7
|
-
|
|
8
|
-
|
|
11
|
+
const restricted = savedReferencesOnlyOf(req.context);
|
|
12
|
+
const placed = unsaved && !unsaved.isPlaced && isReadOf(read, unsaved.field) ? unsaved : null;
|
|
13
|
+
const held = restricted && !restricted.isApplied && isReadOf(read, restricted.field) ? restricted : null;
|
|
14
|
+
if (!placed && !held) return;
|
|
9
15
|
const schema = schemaCache.get(document.collectionSlug, req.payload);
|
|
10
16
|
if (!schema) return;
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
17
|
+
const locale = localeOf(req);
|
|
18
|
+
const savedField = held && richTextValueAt(schema, stored, held.field.key, locale);
|
|
19
|
+
const saved = savedField?.holder[savedField.property];
|
|
20
|
+
if (placed) {
|
|
21
|
+
placed.isPlaced = placeUnsavedState(stored, schema, {
|
|
22
|
+
fieldKey: placed.field.key,
|
|
23
|
+
locale,
|
|
24
|
+
state: placed.state
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
if (held && savedField) {
|
|
28
|
+
savedField.holder[savedField.property] = withOnlyReferencesOf(savedField.holder[savedField.property], saved, isPrivateCollectionOf(req.payload));
|
|
29
|
+
held.isApplied = true;
|
|
30
|
+
}
|
|
16
31
|
};
|
|
17
32
|
export const createUnsavedRichTextHook = (schemaCache)=>({ collection, doc, overrideAccess, req })=>{
|
|
18
33
|
if (collection.auth) return doc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/server/unsavedRichText/hooks.ts"],"sourcesContent":["import type { CollectionBeforeReadHook, GlobalBeforeReadHook, PayloadRequest } from \"payload\";\n\nimport type { VeDocument } from \"../../shared/protocol.js\";\nimport type { SchemaCache } from \"../schemaCache.js\";\n\nimport { localeOf } from \"../localeCodesKeyingValues.js\";\nimport { collectionDocumentOf, documentAddressOf } from \"../../shared/veDocument.js\";\nimport { placeUnsavedState } from \"./placeUnsavedState.js\";\nimport { unsavedRichTextOf } from \"./readContext.js\";\n\ntype DocumentRead = {\n document: VeDocument;\n overrideAccess: boolean | undefined;\n req: PayloadRequest;\n stored: unknown;\n};\n\nconst
|
|
1
|
+
{"version":3,"sources":["../../../src/server/unsavedRichText/hooks.ts"],"sourcesContent":["import type { CollectionBeforeReadHook, GlobalBeforeReadHook, PayloadRequest } from \"payload\";\n\nimport type { LiveRichTextField, VeDocument } from \"../../shared/protocol.js\";\nimport type { SchemaCache } from \"../schemaCache.js\";\n\nimport { localeOf } from \"../localeCodesKeyingValues.js\";\nimport { collectionDocumentOf, documentAddressOf } from \"../../shared/veDocument.js\";\nimport { placeUnsavedState } from \"./placeUnsavedState.js\";\nimport { savedReferencesOnlyOf, unsavedRichTextOf } from \"./readContext.js\";\nimport { isPrivateCollectionOf, withOnlyReferencesOf } from \"./savedReferences.js\";\nimport { richTextValueAt } from \"../../shared/editableSchema/editableSchema.js\";\n\ntype DocumentRead = {\n document: VeDocument;\n overrideAccess: boolean | undefined;\n req: PayloadRequest;\n stored: unknown;\n};\n\nconst isReadOf = (\n { document, overrideAccess }: DocumentRead,\n field: LiveRichTextField | undefined\n): field is LiveRichTextField =>\n field !== undefined &&\n overrideAccess === false &&\n documentAddressOf(field) === documentAddressOf(document);\n\nconst placeIntoReadDocument = (read: DocumentRead, schemaCache: SchemaCache): void => {\n const { document, req, stored } = read;\n const unsaved = unsavedRichTextOf(req.context);\n const restricted = savedReferencesOnlyOf(req.context);\n const placed = unsaved && !unsaved.isPlaced && isReadOf(read, unsaved.field) ? unsaved : null;\n const held =\n restricted && !restricted.isApplied && isReadOf(read, restricted.field) ? restricted : null;\n if (!placed && !held) return;\n\n const schema = schemaCache.get(document.collectionSlug, req.payload);\n if (!schema) return;\n const locale = localeOf(req);\n const savedField = held && richTextValueAt(schema, stored, held.field.key, locale);\n const saved = savedField?.holder[savedField.property];\n\n if (placed) {\n placed.isPlaced = placeUnsavedState(stored, schema, {\n fieldKey: placed.field.key,\n locale,\n state: placed.state,\n });\n }\n if (held && savedField) {\n savedField.holder[savedField.property] = withOnlyReferencesOf(\n savedField.holder[savedField.property],\n saved,\n isPrivateCollectionOf(req.payload)\n );\n held.isApplied = true;\n }\n};\n\nexport const createUnsavedRichTextHook =\n (schemaCache: SchemaCache): CollectionBeforeReadHook =>\n ({ collection, doc, overrideAccess, req }) => {\n if (collection.auth) return doc;\n const document = collectionDocumentOf(collection.slug, doc?.id);\n placeIntoReadDocument({ document, overrideAccess, req, stored: doc }, schemaCache);\n return doc;\n };\n\nexport const createGlobalUnsavedRichTextHook =\n (schemaCache: SchemaCache): GlobalBeforeReadHook =>\n ({ doc, global, overrideAccess, req }) => {\n const document: VeDocument = { collectionSlug: global.slug, kind: \"global\" };\n placeIntoReadDocument({ document, overrideAccess, req, stored: doc }, schemaCache);\n return doc;\n };\n"],"names":["localeOf","collectionDocumentOf","documentAddressOf","placeUnsavedState","savedReferencesOnlyOf","unsavedRichTextOf","isPrivateCollectionOf","withOnlyReferencesOf","richTextValueAt","isReadOf","document","overrideAccess","field","undefined","placeIntoReadDocument","read","schemaCache","req","stored","unsaved","context","restricted","placed","isPlaced","held","isApplied","schema","get","collectionSlug","payload","locale","savedField","key","saved","holder","property","fieldKey","state","createUnsavedRichTextHook","collection","doc","auth","slug","id","createGlobalUnsavedRichTextHook","global","kind"],"mappings":"AAKA,SAASA,QAAQ,QAAQ,gCAAgC;AACzD,SAASC,oBAAoB,EAAEC,iBAAiB,QAAQ,6BAA6B;AACrF,SAASC,iBAAiB,QAAQ,yBAAyB;AAC3D,SAASC,qBAAqB,EAAEC,iBAAiB,QAAQ,mBAAmB;AAC5E,SAASC,qBAAqB,EAAEC,oBAAoB,QAAQ,uBAAuB;AACnF,SAASC,eAAe,QAAQ,gDAAgD;AAShF,MAAMC,WAAW,CACf,EAAEC,QAAQ,EAAEC,cAAc,EAAgB,EAC1CC,QAEAA,UAAUC,aACVF,mBAAmB,SACnBT,kBAAkBU,WAAWV,kBAAkBQ;AAEjD,MAAMI,wBAAwB,CAACC,MAAoBC;IACjD,MAAM,EAAEN,QAAQ,EAAEO,GAAG,EAAEC,MAAM,EAAE,GAAGH;IAClC,MAAMI,UAAUd,kBAAkBY,IAAIG,OAAO;IAC7C,MAAMC,aAAajB,sBAAsBa,IAAIG,OAAO;IACpD,MAAME,SAASH,WAAW,CAACA,QAAQI,QAAQ,IAAId,SAASM,MAAMI,QAAQP,KAAK,IAAIO,UAAU;IACzF,MAAMK,OACJH,cAAc,CAACA,WAAWI,SAAS,IAAIhB,SAASM,MAAMM,WAAWT,KAAK,IAAIS,aAAa;IACzF,IAAI,CAACC,UAAU,CAACE,MAAM;IAEtB,MAAME,SAASV,YAAYW,GAAG,CAACjB,SAASkB,cAAc,EAAEX,IAAIY,OAAO;IACnE,IAAI,CAACH,QAAQ;IACb,MAAMI,SAAS9B,SAASiB;IACxB,MAAMc,aAAaP,QAAQhB,gBAAgBkB,QAAQR,QAAQM,KAAKZ,KAAK,CAACoB,GAAG,EAAEF;IAC3E,MAAMG,QAAQF,YAAYG,MAAM,CAACH,WAAWI,QAAQ,CAAC;IAErD,IAAIb,QAAQ;QACVA,OAAOC,QAAQ,GAAGpB,kBAAkBe,QAAQQ,QAAQ;YAClDU,UAAUd,OAAOV,KAAK,CAACoB,GAAG;YAC1BF;YACAO,OAAOf,OAAOe,KAAK;QACrB;IACF;IACA,IAAIb,QAAQO,YAAY;QACtBA,WAAWG,MAAM,CAACH,WAAWI,QAAQ,CAAC,GAAG5B,qBACvCwB,WAAWG,MAAM,CAACH,WAAWI,QAAQ,CAAC,EACtCF,OACA3B,sBAAsBW,IAAIY,OAAO;QAEnCL,KAAKC,SAAS,GAAG;IACnB;AACF;AAEA,OAAO,MAAMa,4BACX,CAACtB,cACD,CAAC,EAAEuB,UAAU,EAAEC,GAAG,EAAE7B,cAAc,EAAEM,GAAG,EAAE;QACvC,IAAIsB,WAAWE,IAAI,EAAE,OAAOD;QAC5B,MAAM9B,WAAWT,qBAAqBsC,WAAWG,IAAI,EAAEF,KAAKG;QAC5D7B,sBAAsB;YAAEJ;YAAUC;YAAgBM;YAAKC,QAAQsB;QAAI,GAAGxB;QACtE,OAAOwB;IACT,EAAE;AAEJ,OAAO,MAAMI,kCACX,CAAC5B,cACD,CAAC,EAAEwB,GAAG,EAAEK,MAAM,EAAElC,cAAc,EAAEM,GAAG,EAAE;QACnC,MAAMP,WAAuB;YAAEkB,gBAAgBiB,OAAOH,IAAI;YAAEI,MAAM;QAAS;QAC3EhC,sBAAsB;YAAEJ;YAAUC;YAAgBM;YAAKC,QAAQsB;QAAI,GAAGxB;QACtE,OAAOwB;IACT,EAAE"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { richTextValueAt } from "../../shared/editableSchema/editableSchema.js";
|
|
2
2
|
import { withBlockFieldsOf } from "../../shared/richText/blockNodes.js";
|
|
3
|
-
import { withSavedNodeFieldsOf } from "
|
|
3
|
+
import { withSavedNodeFieldsOf } from "../../shared/richText/savedNodeFields.js";
|
|
4
4
|
export const placeUnsavedState = (storedDocument, schema, { fieldKey, locale, state })=>{
|
|
5
5
|
const field = richTextValueAt(schema, storedDocument, fieldKey, locale);
|
|
6
6
|
if (!field) return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/server/unsavedRichText/placeUnsavedState.ts"],"sourcesContent":["import type { VeEditorState } from \"../../shared/protocol.js\";\n\nimport { richTextValueAt } from \"../../shared/editableSchema/editableSchema.js\";\nimport type { EditableSchema } from \"../../shared/editableSchema/editableSchema.js\";\nimport { withBlockFieldsOf } from \"../../shared/richText/blockNodes.js\";\nimport { withSavedNodeFieldsOf } from \"
|
|
1
|
+
{"version":3,"sources":["../../../src/server/unsavedRichText/placeUnsavedState.ts"],"sourcesContent":["import type { VeEditorState } from \"../../shared/protocol.js\";\n\nimport { richTextValueAt } from \"../../shared/editableSchema/editableSchema.js\";\nimport type { EditableSchema } from \"../../shared/editableSchema/editableSchema.js\";\nimport { withBlockFieldsOf } from \"../../shared/richText/blockNodes.js\";\nimport { withSavedNodeFieldsOf } from \"../../shared/richText/savedNodeFields.js\";\n\nexport type UnsavedPlacement = {\n fieldKey: string;\n locale: string | undefined;\n state: VeEditorState;\n};\n\nexport const placeUnsavedState = (\n storedDocument: unknown,\n schema: EditableSchema,\n { fieldKey, locale, state }: UnsavedPlacement\n): boolean => {\n const field = richTextValueAt(schema, storedDocument, fieldKey, locale);\n if (!field) return false;\n const stored = field.holder[field.property];\n field.holder[field.property] = withSavedNodeFieldsOf(withBlockFieldsOf(state, stored), stored);\n return true;\n};\n"],"names":["richTextValueAt","withBlockFieldsOf","withSavedNodeFieldsOf","placeUnsavedState","storedDocument","schema","fieldKey","locale","state","field","stored","holder","property"],"mappings":"AAEA,SAASA,eAAe,QAAQ,gDAAgD;AAEhF,SAASC,iBAAiB,QAAQ,sCAAsC;AACxE,SAASC,qBAAqB,QAAQ,2CAA2C;AAQjF,OAAO,MAAMC,oBAAoB,CAC/BC,gBACAC,QACA,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,KAAK,EAAoB;IAE7C,MAAMC,QAAQT,gBAAgBK,QAAQD,gBAAgBE,UAAUC;IAChE,IAAI,CAACE,OAAO,OAAO;IACnB,MAAMC,SAASD,MAAME,MAAM,CAACF,MAAMG,QAAQ,CAAC;IAC3CH,MAAME,MAAM,CAACF,MAAMG,QAAQ,CAAC,GAAGV,sBAAsBD,kBAAkBO,OAAOE,SAASA;IACvF,OAAO;AACT,EAAE"}
|
|
@@ -1,31 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { withRelatedDocumentsAsIds } from "./relatedIds.js";
|
|
4
|
-
const MAX_EDITOR_STATE_NESTING = 256;
|
|
5
|
-
const ROOT_NODE_TYPE = "root";
|
|
6
|
-
const isNestedWithin = (posted, maxNesting)=>{
|
|
7
|
-
const pending = [
|
|
8
|
-
{
|
|
9
|
-
nesting: 0,
|
|
10
|
-
value: posted
|
|
11
|
-
}
|
|
12
|
-
];
|
|
13
|
-
for(let next = pending.pop(); next !== undefined; next = pending.pop()){
|
|
14
|
-
const { nesting, value } = next;
|
|
15
|
-
if (typeof value !== "object" || value === null) continue;
|
|
16
|
-
if (nesting === maxNesting) return false;
|
|
17
|
-
for (const child of Object.values(value))pending.push({
|
|
18
|
-
nesting: nesting + 1,
|
|
19
|
-
value: child
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
return true;
|
|
23
|
-
};
|
|
24
|
-
const isNodeTree = (node)=>{
|
|
25
|
-
if (!isPlainObject(node) || typeof node.type !== "string") return false;
|
|
26
|
-
const { children } = node;
|
|
27
|
-
return children === undefined || Array.isArray(children) && children.every(isNodeTree);
|
|
28
|
-
};
|
|
1
|
+
import { isEditorStateTree } from "../../shared/richText/editorStateTree.js";
|
|
2
|
+
import { withRelatedDocumentsAsIds } from "../../shared/richText/relatedIds.js";
|
|
29
3
|
const asJson = (posted)=>{
|
|
30
4
|
try {
|
|
31
5
|
return JSON.stringify(posted) ?? null;
|
|
@@ -37,9 +11,7 @@ export const readPostedEditorState = (posted, maxLength)=>{
|
|
|
37
11
|
const json = asJson(posted);
|
|
38
12
|
if (json === null || json.length > maxLength) return null;
|
|
39
13
|
const state = JSON.parse(json);
|
|
40
|
-
|
|
41
|
-
if (!root || !isNestedWithin(state, MAX_EDITOR_STATE_NESTING)) return null;
|
|
42
|
-
return root.type === ROOT_NODE_TYPE && isNodeTree(root) ? withRelatedDocumentsAsIds(state) : null;
|
|
14
|
+
return isEditorStateTree(state) ? withRelatedDocumentsAsIds(state) : null;
|
|
43
15
|
};
|
|
44
16
|
|
|
45
17
|
//# sourceMappingURL=postedEditorState.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/server/unsavedRichText/postedEditorState.ts"],"sourcesContent":["import type { VeEditorState } from \"../../shared/protocol.js\";\n\nimport {
|
|
1
|
+
{"version":3,"sources":["../../../src/server/unsavedRichText/postedEditorState.ts"],"sourcesContent":["import type { VeEditorState } from \"../../shared/protocol.js\";\n\nimport { isEditorStateTree } from \"../../shared/richText/editorStateTree.js\";\nimport { withRelatedDocumentsAsIds } from \"../../shared/richText/relatedIds.js\";\n\nconst asJson = (posted: unknown): string | null => {\n try {\n return JSON.stringify(posted) ?? null;\n } catch {\n return null;\n }\n};\n\nexport const readPostedEditorState = (posted: unknown, maxLength: number): VeEditorState | null => {\n const json = asJson(posted);\n if (json === null || json.length > maxLength) return null;\n\n const state: unknown = JSON.parse(json);\n return isEditorStateTree(state) ? withRelatedDocumentsAsIds(state) : null;\n};\n"],"names":["isEditorStateTree","withRelatedDocumentsAsIds","asJson","posted","JSON","stringify","readPostedEditorState","maxLength","json","length","state","parse"],"mappings":"AAEA,SAASA,iBAAiB,QAAQ,2CAA2C;AAC7E,SAASC,yBAAyB,QAAQ,sCAAsC;AAEhF,MAAMC,SAAS,CAACC;IACd,IAAI;QACF,OAAOC,KAAKC,SAAS,CAACF,WAAW;IACnC,EAAE,OAAM;QACN,OAAO;IACT;AACF;AAEA,OAAO,MAAMG,wBAAwB,CAACH,QAAiBI;IACrD,MAAMC,OAAON,OAAOC;IACpB,IAAIK,SAAS,QAAQA,KAAKC,MAAM,GAAGF,WAAW,OAAO;IAErD,MAAMG,QAAiBN,KAAKO,KAAK,CAACH;IAClC,OAAOR,kBAAkBU,SAAST,0BAA0BS,SAAS;AACvE,EAAE"}
|
|
@@ -20,7 +20,7 @@ export type Unsaved = {
|
|
|
20
20
|
field: LiveRichTextField;
|
|
21
21
|
fieldPath: string;
|
|
22
22
|
locale: string | undefined;
|
|
23
|
-
state: VeEditorState;
|
|
23
|
+
state: VeEditorState | null;
|
|
24
24
|
};
|
|
25
25
|
export type User = Awaited<ReturnType<Payload["auth"]>>["user"];
|
|
26
26
|
export type SignedIn = {
|
|
@@ -31,6 +31,7 @@ export type PostedReadLimits = {
|
|
|
31
31
|
maxStateLength: number;
|
|
32
32
|
signal: AbortSignal;
|
|
33
33
|
};
|
|
34
|
+
export declare const readUnsaved: (payload: Payload, body: unknown, maxStateLength: number) => Unsaved | null;
|
|
34
35
|
export declare const signInAndReadBody: (payload: Payload, request: Request, { maxStateLength, signal }: PostedReadLimits) => Promise<SignedIn | null>;
|
|
35
36
|
export declare const checkAndSignIn: (payload: Payload, request: unknown, headers: Headers | undefined, { maxStateLength }: PostedReadLimits) => Promise<SignedIn | null>;
|
|
36
37
|
export {};
|
|
@@ -55,19 +55,29 @@ const fieldPathOf = (payload, { collectionSlug, key })=>{
|
|
|
55
55
|
const schema = schemaCache.get(collectionSlug, payload);
|
|
56
56
|
return schema && schemaPathOfRichText(schema, key);
|
|
57
57
|
};
|
|
58
|
-
const
|
|
58
|
+
const SAVED_VALUE = {
|
|
59
|
+
state: null
|
|
60
|
+
};
|
|
61
|
+
const postedStateOf = (posted, maxStateLength)=>{
|
|
62
|
+
if (posted === undefined) return SAVED_VALUE;
|
|
63
|
+
const state = readPostedEditorState(posted, maxStateLength);
|
|
64
|
+
return state && {
|
|
65
|
+
state
|
|
66
|
+
};
|
|
67
|
+
};
|
|
68
|
+
export const readUnsaved = (payload, body, maxStateLength)=>{
|
|
59
69
|
if (!isPlainObject(body)) return null;
|
|
60
70
|
const field = readField(body.field);
|
|
61
71
|
const document = field && documentOf(payload, field);
|
|
62
72
|
const fieldPath = document && fieldPathOf(payload, field);
|
|
63
|
-
const
|
|
64
|
-
if (!field || !document || !fieldPath || !
|
|
73
|
+
const posted = fieldPath && postedStateOf(body.state, maxStateLength);
|
|
74
|
+
if (!field || !document || !fieldPath || !posted || !isLocaleOf(payload, body.locale)) return null;
|
|
65
75
|
return {
|
|
66
76
|
document,
|
|
67
77
|
field,
|
|
68
78
|
fieldPath,
|
|
69
79
|
locale: body.locale,
|
|
70
|
-
state
|
|
80
|
+
state: posted.state
|
|
71
81
|
};
|
|
72
82
|
};
|
|
73
83
|
const userOf = async (payload, headers)=>(await payload.auth({
|