@contentstack/studio-client 1.5.1 → 1.7.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/dist/composable-studio/build-scoped-data.js +77 -8
- package/dist/composable-studio/build-scoped-data.js.map +1 -1
- package/dist/composable-studio/collect-data-needs.js +54 -10
- package/dist/composable-studio/collect-data-needs.js.map +1 -1
- package/dist/composable-studio/sdk.js +710 -146
- package/dist/composable-studio/sdk.js.map +1 -1
- package/dist/index.d.ts +220 -31
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/json-rte-registry/embedded-entry-conversion.js +186 -0
- package/dist/json-rte-registry/embedded-entry-conversion.js.map +1 -0
- package/dist/json-rte-registry/index.js +73 -33
- package/dist/json-rte-registry/index.js.map +1 -1
- package/dist/json-rte-registry/stack-sdk-store.js +10 -0
- package/dist/json-rte-registry/stack-sdk-store.js.map +1 -0
- package/dist/node_modules/fflate/esm/browser.js +1 -7
- package/dist/node_modules/fflate/esm/browser.js.map +1 -1
- package/dist/packages/studio-internal/dist/utils/section-slot-walker.js +63 -0
- package/dist/packages/studio-internal/dist/utils/section-slot-walker.js.map +1 -0
- package/dist/utils/canvas.js +14 -0
- package/dist/utils/canvas.js.map +1 -1
- package/dist/utils/constants.js +1 -1
- package/dist/utils/is-composition-being-edited.js.map +1 -1
- package/dist/utils/reference_fetcher.js +31 -1
- package/dist/utils/reference_fetcher.js.map +1 -1
- package/dist/utils/sdk.js +14 -1
- package/dist/utils/sdk.js.map +1 -1
- package/package.json +7 -7
|
@@ -1,17 +1,86 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
/**
|
|
2
|
+
* A reference stub is the inline reference object Contentstack returns at a
|
|
3
|
+
* reference field: `{uid, _content_type_uid}` (CDA sometimes inlines the full
|
|
4
|
+
* entry, sometimes only the stub depending on `include[]`). We detect a stub
|
|
5
|
+
* by its shape: object with both keys and a missing/empty payload beyond the
|
|
6
|
+
* `_content_type_uid`/`uid`/locale/system fields.
|
|
7
|
+
*/
|
|
8
|
+
function isReferenceStub(v) {
|
|
9
|
+
return (!!v &&
|
|
10
|
+
typeof v === "object" &&
|
|
11
|
+
!Array.isArray(v) &&
|
|
12
|
+
typeof v.uid === "string" &&
|
|
13
|
+
typeof v._content_type_uid === "string");
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* If `v` is a reference stub and a resolved entry exists in the pool, return
|
|
17
|
+
* the resolved entry; otherwise return `v` unchanged. Logs a dev-only warning
|
|
18
|
+
* when a stub cannot be resolved so authors can spot misconfigured includes.
|
|
19
|
+
*/
|
|
20
|
+
function followReference(v, entriesByKey) {
|
|
21
|
+
if (!entriesByKey || !isReferenceStub(v))
|
|
22
|
+
return v;
|
|
23
|
+
// CDA may have already inlined the full entry into the stub object. If we
|
|
24
|
+
// can see fields beyond the meta keys we treat it as resolved already.
|
|
25
|
+
const META_KEYS = new Set([
|
|
26
|
+
"uid",
|
|
27
|
+
"_content_type_uid",
|
|
28
|
+
"_version",
|
|
29
|
+
"locale",
|
|
30
|
+
"ACL",
|
|
31
|
+
"_metadata",
|
|
32
|
+
]);
|
|
33
|
+
const hasPayload = Object.keys(v).some((k) => !META_KEYS.has(k));
|
|
34
|
+
if (hasPayload)
|
|
35
|
+
return v;
|
|
36
|
+
const key = `${v._content_type_uid}:${v.uid}`;
|
|
37
|
+
const resolved = entriesByKey.get(key);
|
|
38
|
+
if (resolved !== undefined)
|
|
39
|
+
return resolved;
|
|
40
|
+
if (process.env.NODE_ENV === "development") {
|
|
41
|
+
console.warn(`buildScopedDataSources: unresolved reference ${key} encountered during section scoping`);
|
|
42
|
+
}
|
|
43
|
+
return v;
|
|
44
|
+
}
|
|
45
|
+
function getScopedData(obj, selectedField, entriesByKey) {
|
|
46
|
+
if (!selectedField) {
|
|
47
|
+
// Even with no path, if we land on an array of stubs (e.g. a section bound
|
|
48
|
+
// to scope-root where the scope IS a reference list) replace each stub
|
|
49
|
+
// with its resolved entry so downstream iteration sees real entries.
|
|
50
|
+
if (Array.isArray(obj)) {
|
|
51
|
+
return obj.map((item) => followReference(item, entriesByKey));
|
|
52
|
+
}
|
|
53
|
+
return followReference(obj, entriesByKey);
|
|
54
|
+
}
|
|
55
|
+
const traversed = selectedField.split(".").reduce((val, seg) => {
|
|
5
56
|
if (val == null)
|
|
6
57
|
return val;
|
|
58
|
+
// Swap a reference stub for its resolved entry before drilling further.
|
|
59
|
+
val = followReference(val, entriesByKey);
|
|
7
60
|
const arrayMatch = seg.match(/^(.*?)\[(\d+)\]$/);
|
|
8
61
|
if (arrayMatch) {
|
|
9
62
|
const [, name, idxStr] = arrayMatch;
|
|
10
63
|
const next = name ? val[name] : val;
|
|
11
|
-
|
|
64
|
+
if (next == null)
|
|
65
|
+
return next;
|
|
66
|
+
const item = next[Number(idxStr)];
|
|
67
|
+
return followReference(item, entriesByKey);
|
|
68
|
+
}
|
|
69
|
+
// Non-indexed field access landing on an ARRAY → default to the first
|
|
70
|
+
// element so an un-indexed array-ancestor path (e.g.
|
|
71
|
+
// "navigation_menu_3.menu_subitems") resolves instead of array[field] →
|
|
72
|
+
// undefined. Indexed pushes (`…[n]…`) override with the picked instance.
|
|
73
|
+
if (Array.isArray(val)) {
|
|
74
|
+
const first = followReference(val[0], entriesByKey);
|
|
75
|
+
return first == null ? null : followReference(first[seg], entriesByKey);
|
|
12
76
|
}
|
|
13
|
-
|
|
14
|
-
|
|
77
|
+
const next = val[seg];
|
|
78
|
+
return followReference(next, entriesByKey);
|
|
79
|
+
}, obj);
|
|
80
|
+
if (Array.isArray(traversed)) {
|
|
81
|
+
return traversed.map((item) => followReference(item, entriesByKey));
|
|
82
|
+
}
|
|
83
|
+
return traversed ?? null;
|
|
15
84
|
}
|
|
16
85
|
function applyUidRemapping(scoped, uidRemapping = {}) {
|
|
17
86
|
if (!scoped ||
|
|
@@ -69,7 +138,7 @@ function buildScopedDataSources(pool, needsBySection, pageDataSources) {
|
|
|
69
138
|
}
|
|
70
139
|
}
|
|
71
140
|
const pageTemplate = pageDataSources.template;
|
|
72
|
-
const scopedTemplate = applyUidRemapping(getScopedData(pageTemplate, needs.selectedField), needs.uidRemapping);
|
|
141
|
+
const scopedTemplate = applyUidRemapping(getScopedData(pageTemplate, needs.selectedField, pool.entriesByKey), needs.uidRemapping);
|
|
73
142
|
let repeater;
|
|
74
143
|
if (needs.parentRepeaterUID) {
|
|
75
144
|
const ctx = pageDataSources.repeater?.[needs.parentRepeaterUID];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-scoped-data.js","sources":["../../src/composable-studio/build-scoped-data.ts"],"sourcesContent":[null],"names":[],"mappings":"AAMA,SAAS,aAAa,CAAC,GAAQ,
|
|
1
|
+
{"version":3,"file":"build-scoped-data.js","sources":["../../src/composable-studio/build-scoped-data.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,25 @@
|
|
|
1
|
+
import { indexSectionSlotContexts } from '../packages/studio-internal/dist/utils/section-slot-walker.js';
|
|
2
|
+
|
|
1
3
|
const SECTION_COMPOSITION_NODE_TYPE = "section-composition";
|
|
4
|
+
/**
|
|
5
|
+
* For a wrapper section's authored UI, map each `section-slot` uid to the uid
|
|
6
|
+
* of its nearest ancestor Repeater (or null). A section dropped into that slot
|
|
7
|
+
* on the page inherits this INTERNAL repeater as its `parentRepeaterUID` — the
|
|
8
|
+
* page-UI-only walk can't see it because the repeater lives inside the wrapper
|
|
9
|
+
* section's own composition, not the page tree. Mirrors the render-side
|
|
10
|
+
* `indexSectionInternalSlotRepeaters` in studio-react-components so the
|
|
11
|
+
* fetch/scope pipeline and the renderer agree on per-iteration scoping.
|
|
12
|
+
*/
|
|
13
|
+
function indexSectionInternalSlotRepeaters(sectionUI) {
|
|
14
|
+
const ctx = indexSectionSlotContexts(sectionUI);
|
|
15
|
+
const out = {};
|
|
16
|
+
for (const [slotUid, slotCtx] of Object.entries(ctx)) {
|
|
17
|
+
const repeaterAncestors = slotCtx.ancestorNodes.filter((n) => n.type === "repeater");
|
|
18
|
+
const nearest = repeaterAncestors.at(-1);
|
|
19
|
+
out[slotUid] = nearest?.uid ?? null;
|
|
20
|
+
}
|
|
21
|
+
return out;
|
|
22
|
+
}
|
|
2
23
|
function entryKey(ctUid, entryUid) {
|
|
3
24
|
return `${ctUid}:${entryUid}`;
|
|
4
25
|
}
|
|
@@ -148,32 +169,55 @@ const REPEATER_NODE_TYPES = new Set([
|
|
|
148
169
|
"repeater",
|
|
149
170
|
"TEMPLATE_REPEATER",
|
|
150
171
|
]);
|
|
151
|
-
function walkUiForSectionInstances(ui, visit, parentRepeaterUID) {
|
|
172
|
+
function walkUiForSectionInstances(ui, visit, sectionsByUid, parentRepeaterUID) {
|
|
152
173
|
if (!ui)
|
|
153
174
|
return;
|
|
154
175
|
const node = ui;
|
|
155
176
|
const nextRepeater = REPEATER_NODE_TYPES.has(node.type) && node.uid
|
|
156
177
|
? node.uid
|
|
157
178
|
: parentRepeaterUID;
|
|
158
|
-
|
|
159
|
-
node.metadata?.compositionUID
|
|
160
|
-
|
|
179
|
+
const isSectionComposition = node.type === SECTION_COMPOSITION_NODE_TYPE &&
|
|
180
|
+
!!node.metadata?.compositionUID;
|
|
181
|
+
if (isSectionComposition && node.uid) {
|
|
182
|
+
// The page-composer's per-instance Linked Field binding is persisted on the
|
|
183
|
+
// slate node as `metadata.sectionBindingOverride` (see Studio's
|
|
184
|
+
// SectionFieldBinding + the render-side seedSectionInstanceBindings). Honour
|
|
185
|
+
// it here so standalone cold loads scope the section against the SAME field
|
|
186
|
+
// the editor/render uses; otherwise we fall through to the legacy
|
|
187
|
+
// `metadata.selectedField` and the linked_schemas default, which can point
|
|
188
|
+
// at a field that doesn't exist on the page CT for cross-CT ref-target binds.
|
|
189
|
+
const override = node.metadata?.sectionBindingOverride;
|
|
161
190
|
visit(node.uid, node.metadata.compositionUID, {
|
|
162
191
|
parentRepeaterUID,
|
|
163
|
-
selectedField:
|
|
164
|
-
|
|
192
|
+
selectedField: typeof override?.selectedField === "string"
|
|
193
|
+
? override.selectedField
|
|
194
|
+
: node.metadata.selectedField,
|
|
195
|
+
uidRemapping: override?.uidRemapping ?? node.metadata.uidRemapping,
|
|
165
196
|
});
|
|
166
197
|
}
|
|
198
|
+
// When this node is a wrapper section, sections dropped into its slots
|
|
199
|
+
// inherit the slot's nearest INTERNAL repeater (authored inside the wrapper)
|
|
200
|
+
// as their parentRepeaterUID. Without this, a nested section iterating a
|
|
201
|
+
// wrapper's per-iteration scope is scoped to the page root and renders the
|
|
202
|
+
// same (or no) value for every iteration.
|
|
203
|
+
const slotRepeaterMap = isSectionComposition && sectionsByUid.get(node.metadata.compositionUID)?.ui
|
|
204
|
+
? indexSectionInternalSlotRepeaters(sectionsByUid.get(node.metadata.compositionUID).ui)
|
|
205
|
+
: null;
|
|
167
206
|
if (node.slots && typeof node.slots === "object") {
|
|
168
|
-
for (const
|
|
207
|
+
for (const slotId of Object.keys(node.slots)) {
|
|
208
|
+
const slotInternalRepeater = slotRepeaterMap
|
|
209
|
+
? (slotRepeaterMap[slotId] ?? null)
|
|
210
|
+
: null;
|
|
211
|
+
const childRepeater = slotInternalRepeater ?? nextRepeater;
|
|
212
|
+
const slotNodes = node.slots[slotId];
|
|
169
213
|
const arr = Array.isArray(slotNodes) ? slotNodes : [slotNodes];
|
|
170
214
|
for (const child of arr)
|
|
171
|
-
walkUiForSectionInstances(child, visit,
|
|
215
|
+
walkUiForSectionInstances(child, visit, sectionsByUid, childRepeater);
|
|
172
216
|
}
|
|
173
217
|
}
|
|
174
218
|
if (Array.isArray(node.children)) {
|
|
175
219
|
for (const child of node.children)
|
|
176
|
-
walkUiForSectionInstances(child, visit, nextRepeater);
|
|
220
|
+
walkUiForSectionInstances(child, visit, sectionsByUid, nextRepeater);
|
|
177
221
|
}
|
|
178
222
|
}
|
|
179
223
|
/**
|
|
@@ -213,7 +257,7 @@ function collectAllDataNeeds(pageComposition, pageUiTree, sectionCompositions) {
|
|
|
213
257
|
uidRemapping: ctx.uidRemapping,
|
|
214
258
|
componentPropsFallback: baseNeeds.externalData,
|
|
215
259
|
});
|
|
216
|
-
});
|
|
260
|
+
}, sectionCompositions);
|
|
217
261
|
return {
|
|
218
262
|
pool,
|
|
219
263
|
needsBySection,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collect-data-needs.js","sources":["../../src/composable-studio/collect-data-needs.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"collect-data-needs.js","sources":["../../src/composable-studio/collect-data-needs.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|