@contentstack/studio-client 4.1.0 → 4.2.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/breakpoints/BreakpointManager.js +3 -2
- package/dist/breakpoints/BreakpointManager.js.map +1 -1
- package/dist/breakpoints/breakpoint-origin.js +30 -0
- package/dist/breakpoints/breakpoint-origin.js.map +1 -0
- package/dist/canvas/canvas.type.js +1 -1
- package/dist/canvas/canvas.utils.js +165 -4
- package/dist/canvas/canvas.utils.js.map +1 -1
- package/dist/composable-studio/binding-defect-report.js +106 -0
- package/dist/composable-studio/binding-defect-report.js.map +1 -0
- package/dist/composable-studio/build-scoped-data.js +21 -11
- package/dist/composable-studio/build-scoped-data.js.map +1 -1
- package/dist/composable-studio/collect-data-needs.js +1 -1
- package/dist/composable-studio/data/pre-process-static-values.js +89 -19
- package/dist/composable-studio/data/pre-process-static-values.js.map +1 -1
- package/dist/composable-studio/delivery-setup-check.js +92 -0
- package/dist/composable-studio/delivery-setup-check.js.map +1 -0
- package/dist/composable-studio/resolution-failure-spec.js +53 -0
- package/dist/composable-studio/resolution-failure-spec.js.map +1 -0
- package/dist/composable-studio/resolution-telemetry.js +68 -0
- package/dist/composable-studio/resolution-telemetry.js.map +1 -0
- package/dist/composable-studio/sdk.js +683 -551
- package/dist/composable-studio/sdk.js.map +1 -1
- package/dist/composable-studio/section-binding/compute-all-section-auto-bindings.js +146 -0
- package/dist/composable-studio/section-binding/compute-all-section-auto-bindings.js.map +1 -0
- package/dist/composable-studio/section-binding/constants.js +27 -0
- package/dist/composable-studio/section-binding/constants.js.map +1 -0
- package/dist/composable-studio/section-binding/index.js +20 -0
- package/dist/composable-studio/section-binding/index.js.map +1 -0
- package/dist/composable-studio/section-binding/schema-path.js +112 -0
- package/dist/composable-studio/section-binding/schema-path.js.map +1 -0
- package/dist/composable-studio/section-binding/section-composition-auto-binding.js +815 -0
- package/dist/composable-studio/section-binding/section-composition-auto-binding.js.map +1 -0
- package/dist/composable-studio/section-binding/section-compositions.js +349 -0
- package/dist/composable-studio/section-binding/section-compositions.js.map +1 -0
- package/dist/composable-studio/section-binding/section-internal-ref-introspection.js +72 -0
- package/dist/composable-studio/section-binding/section-internal-ref-introspection.js.map +1 -0
- package/dist/composable-studio/section-binding/self-describe-section-bindings.js +132 -0
- package/dist/composable-studio/section-binding/self-describe-section-bindings.js.map +1 -0
- package/dist/composable-studio/section-binding/serialization.js +33 -0
- package/dist/composable-studio/section-binding/serialization.js.map +1 -0
- package/dist/composable-studio/section-data.js +5 -1
- package/dist/composable-studio/section-data.js.map +1 -1
- package/dist/composable-studio/setup-check-signal.js +48 -0
- package/dist/composable-studio/setup-check-signal.js.map +1 -0
- package/dist/composable-studio/studio-intelligence.manager.js +6 -2
- package/dist/composable-studio/studio-intelligence.manager.js.map +1 -1
- package/dist/config/config.schema.js +97 -104
- package/dist/config/config.schema.js.map +1 -1
- package/dist/config/process-user-config.js +41 -24
- package/dist/config/process-user-config.js.map +1 -1
- package/dist/config/stack-sdk-wrapper.js +22 -4
- package/dist/config/stack-sdk-wrapper.js.map +1 -1
- package/dist/context-menu/context-menu.js +1 -0
- package/dist/context-menu/context-menu.js.map +1 -1
- package/dist/dnd/dnd-manager.js +1 -0
- package/dist/dnd/dnd-manager.js.map +1 -1
- package/dist/editor.d.ts +34 -1
- package/dist/highlight-node/highlight-node-manager.js +89 -14
- package/dist/highlight-node/highlight-node-manager.js.map +1 -1
- package/dist/highlight-node/highlight-node.js +11 -5
- package/dist/highlight-node/highlight-node.js.map +1 -1
- package/dist/highlight-node/history-shortcut.js +78 -0
- package/dist/highlight-node/history-shortcut.js.map +1 -0
- package/dist/index.d.ts +1082 -354
- package/dist/index.js +18 -6
- package/dist/index.js.map +1 -1
- package/dist/query/query-executor.js +51 -9
- package/dist/query/query-executor.js.map +1 -1
- package/dist/renderer-mode.d.ts +68 -0
- package/dist/renderer-mode.js +2 -0
- package/dist/renderer-mode.js.map +1 -0
- package/dist/url-metadata/entry-check-key.js +14 -0
- package/dist/url-metadata/entry-check-key.js.map +1 -0
- package/dist/url-metadata/select-url-winner.js +64 -12
- package/dist/url-metadata/select-url-winner.js.map +1 -1
- package/dist/url-metadata/types.js +10 -1
- package/dist/url-metadata/types.js.map +1 -1
- package/dist/url-metadata/url-pattern-matcher.js +11 -2
- package/dist/url-metadata/url-pattern-matcher.js.map +1 -1
- package/dist/utils/canvas.js +0 -1
- package/dist/utils/canvas.js.map +1 -1
- package/dist/utils/check-bindings.js +5 -3
- package/dist/utils/check-bindings.js.map +1 -1
- package/dist/utils/classify-response-error.js +243 -33
- package/dist/utils/classify-response-error.js.map +1 -1
- package/dist/utils/composable-studio-error.js +7 -0
- package/dist/utils/composable-studio-error.js.map +1 -1
- package/dist/utils/conditionBlock.js +19 -6
- package/dist/utils/conditionBlock.js.map +1 -1
- package/dist/utils/constants.js +7 -2
- package/dist/utils/constants.js.map +1 -1
- package/dist/utils/http-error.constants.js +24 -1
- package/dist/utils/http-error.constants.js.map +1 -1
- package/dist/utils/include-path-rules.js +3 -2
- package/dist/utils/include-path-rules.js.map +1 -1
- package/dist/utils/load-error-classifier.js +18 -0
- package/dist/utils/load-error-classifier.js.map +1 -0
- package/dist/utils/parse-ui.js +27 -5
- package/dist/utils/parse-ui.js.map +1 -1
- package/dist/utils/preview-hash-refused.js +75 -0
- package/dist/utils/preview-hash-refused.js.map +1 -0
- package/dist/utils/reference_fetcher.js +79 -12
- package/dist/utils/reference_fetcher.js.map +1 -1
- package/dist/utils/require-stack.js +83 -20
- package/dist/utils/require-stack.js.map +1 -1
- package/dist/utils/serialize-for-inline-script.js +19 -0
- package/dist/utils/serialize-for-inline-script.js.map +1 -0
- package/dist/utils/served-by.js +32 -13
- package/dist/utils/served-by.js.map +1 -1
- package/dist/utils/spec-analyzer.js +24 -1
- package/dist/utils/spec-analyzer.js.map +1 -1
- package/dist/utils/studio-error-codes.js +34 -2
- package/dist/utils/studio-error-codes.js.map +1 -1
- package/dist/utils/studio-error.js +68 -7
- package/dist/utils/studio-error.js.map +1 -1
- package/dist/visual-builder/composition-save-event.js +36 -5
- package/dist/visual-builder/composition-save-event.js.map +1 -1
- package/package.json +12 -8
- package/dist/studio-internal/dist/utils/section-slot-walker.js +0 -63
- package/dist/studio-internal/dist/utils/section-slot-walker.js.map +0 -1
- package/dist/studio-internal/dist/utils/spec-compression.js +0 -43
- package/dist/studio-internal/dist/utils/spec-compression.js.map +0 -1
|
@@ -2,11 +2,12 @@ import { POST_MESSAGE_EVENTS } from '@contentstack/studio-messenger/constants';
|
|
|
2
2
|
import { sendStudioEvent } from '../utils/studio-messaging.js';
|
|
3
3
|
import { BreakpointRegistry, getGlobalStudioStore } from '@contentstack/studio-registry';
|
|
4
4
|
import { DEFAULT_BREAKPOINTS } from './breakpoint.constant.js';
|
|
5
|
-
import '
|
|
5
|
+
import { markBreakpointOrigins } from './breakpoint-origin.js';
|
|
6
6
|
import 'lodash-es';
|
|
7
7
|
import '../utils/editor-mode.js';
|
|
8
8
|
import '../utils/studio-error-codes.js';
|
|
9
9
|
import '../utils/composition-not-found.js';
|
|
10
|
+
import '@contentstack/studio-messenger';
|
|
10
11
|
import '../utils/conditionBlock.js';
|
|
11
12
|
import { clientRendererModeUtil } from '../utils/canvas.js';
|
|
12
13
|
|
|
@@ -69,7 +70,7 @@ class BreakpointManager {
|
|
|
69
70
|
if (!clientRendererModeUtil.isInsideStudioFrame())
|
|
70
71
|
return;
|
|
71
72
|
sendStudioEvent(POST_MESSAGE_EVENTS.REGISTER_BREAKPOINTS, {
|
|
72
|
-
breakpoints: breakpoints,
|
|
73
|
+
breakpoints: markBreakpointOrigins(breakpoints, DEFAULT_BREAKPOINTS),
|
|
73
74
|
}).catch((error) => {
|
|
74
75
|
console.error("Failed to sync breakpoints with studio", error);
|
|
75
76
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BreakpointManager.js","sources":["../../src/breakpoints/BreakpointManager.ts"],"sourcesContent":[null],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BreakpointManager.js","sources":["../../src/breakpoints/BreakpointManager.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;MAYa,iBAAiB,CAAA;IACpB,gBAAgB,GAAsB,IAAI;AAC1C,IAAA,kBAAkB;AAE1B,IAAA,WAAA,GAAA;AACE,QAAA,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,EAAE;AAClD,QAAA,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,EAAE;AACrD,QAAA,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC;IAC/C;AAEA;;;;;AAKG;AACI,IAAA,OAAO,WAAW,GAAA;AACvB,QAAA,MAAM,KAAK,GAAG,oBAAoB,EAAE;AACpC,QAAA,IAAI,CAAC,KAAK,CAAC,iBAAiB,EAAE;AAC5B,YAAA,KAAK,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,EAAE;QACnD;QACA,OAAO,KAAK,CAAC,iBAAsC;IACrD;AAEA;;AAEG;AACI,IAAA,OAAO,aAAa,GAAA;AACzB,QAAA,oBAAoB,EAAE,CAAC,iBAAiB,GAAG,IAAI;IACjD;AAEA,IAAA,mBAAmB,CAAC,UAAsB,EAAA;AACxC,QAAA,IAAI,CAAC,gBAAgB,GAAG,UAAU;IACpC;IAEA,mBAAmB,GAAA;QACjB,OAAO,IAAI,CAAC,gBAAgB;IAC9B;IAEA,sBAAsB,GAAA;QACpB,MAAM,WAAW,GAAiB,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;AAC1E,QAAA,IAAI,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC;AAC/B,QAAA,KAAK,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;AAChD,YAAA,IAAI,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE;AACnD,gBAAA,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC;gBAC3B;YACF;QACF;AACA,QAAA,OAAO,UAAU;IACnB;AAEA,IAAA,mBAAmB,CAAC,WAA4B,EAAA;AAC9C,QAAA,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;AAC5B,YAAA,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC;QAC5C;AAEA,QAAA,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,WAAW,CAAC;QACzD,MAAM,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;AACpE,QAAA,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC;IACrD;IAEA,cAAc,GAAA;AACZ,QAAA,OAAO,IAAI,CAAC,kBAAkB,EAAE,cAAc,EAAE;IAClD;AAEQ,IAAA,yBAAyB,CAAC,WAAyB,EAAA;AACzD,QAAA,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,EAAE;YAAE;AACnD,QAAA,eAAe,CAAC,mBAAmB,CAAC,oBAAoB,EAAE;AACxD,YAAA,WAAW,EAAE,qBAAqB,CAAC,WAAW,EAAE,mBAAmB,CAAC;AACrE,SAAA,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,KAAI;AACjB,YAAA,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC;AAChE,QAAA,CAAC,CAAC;IACJ;AACD;;;;"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { BreakpointRegistry } from '@contentstack/studio-registry';
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Marks each breakpoint by where it comes from, for the `register-breakpoints`
|
|
5
|
+
* event: an app's `registerBreakpoints` replaces the SDK's list wholesale, so
|
|
6
|
+
* a default survives only when the app declares the same id again. Studio's
|
|
7
|
+
* design-system sync relies on this instead of guessing against its own copy
|
|
8
|
+
* of the defaults, which can belong to a different SDK version.
|
|
9
|
+
*/
|
|
10
|
+
function markBreakpointOrigins(breakpoints, defaults) {
|
|
11
|
+
const shipped = new Map(new BreakpointRegistry()
|
|
12
|
+
.processBreakpoints(defaults)
|
|
13
|
+
.map((breakpoint) => [breakpoint.id, breakpoint]));
|
|
14
|
+
return breakpoints.map((breakpoint) => ({
|
|
15
|
+
...breakpoint,
|
|
16
|
+
origin: originOf(breakpoint, shipped.get(breakpoint.id)),
|
|
17
|
+
}));
|
|
18
|
+
}
|
|
19
|
+
function originOf(breakpoint, shipped) {
|
|
20
|
+
if (!shipped)
|
|
21
|
+
return "app";
|
|
22
|
+
const same = breakpoint.displayName === shipped.displayName &&
|
|
23
|
+
breakpoint.query === shipped.query &&
|
|
24
|
+
breakpoint.previewSize?.width === shipped.previewSize.width &&
|
|
25
|
+
breakpoint.previewSize?.height === shipped.previewSize.height;
|
|
26
|
+
return same ? "default" : "overridden";
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export { markBreakpointOrigins };
|
|
30
|
+
//# sourceMappingURL=breakpoint-origin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"breakpoint-origin.js","sources":["../../src/breakpoints/breakpoint-origin.ts"],"sourcesContent":[null],"names":[],"mappings":";;AAOA;;;;;;AAMG;AACG,SAAU,qBAAqB,CACnC,WAAyB,EACzB,QAAyB,EAAA;AAEzB,IAAA,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,IAAI,kBAAkB;SACnB,kBAAkB,CAAC,QAAQ;AAC3B,SAAA,GAAG,CAAC,CAAC,UAAU,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC,CACpD;IACD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,MAAM;AACtC,QAAA,GAAG,UAAU;AACb,QAAA,MAAM,EAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AACzD,KAAA,CAAC,CAAC;AACL;AAEA,SAAS,QAAQ,CACf,UAAsB,EACtB,OAA+B,EAAA;AAE/B,IAAA,IAAI,CAAC,OAAO;AAAE,QAAA,OAAO,KAAK;IAC1B,MAAM,IAAI,GACR,UAAU,CAAC,WAAW,KAAK,OAAO,CAAC,WAAW;AAC9C,QAAA,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC,KAAK;QAClC,UAAU,CAAC,WAAW,EAAE,KAAK,KAAK,OAAO,CAAC,WAAW,CAAC,KAAK;QAC3D,UAAU,CAAC,WAAW,EAAE,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM;IAC/D,OAAO,IAAI,GAAG,SAAS,GAAG,YAAY;AACxC;;;;"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PERMANENT_DROP_ZONE_ELEMENTS } from '../composable-studio/weak-maps.js';
|
|
1
|
+
import { PERMANENT_DROP_ZONE_ELEMENTS, ELEMENT_TO_NODE } from '../composable-studio/weak-maps.js';
|
|
2
2
|
import { COMPOSABLE_DATA_ATTRIBUTES } from '../utils/constants.js';
|
|
3
3
|
import { findPathForElement } from '../utils/editor-utils.js';
|
|
4
4
|
|
|
@@ -149,16 +149,177 @@ const getHitboxDetails = (event) => {
|
|
|
149
149
|
shouldShowSlotDropzone: false,
|
|
150
150
|
};
|
|
151
151
|
};
|
|
152
|
+
/**
|
|
153
|
+
* The box an element occupies on screen, or null when it rendered none. A
|
|
154
|
+
* `display: contents` wrapper (Repeater, Condition Block) has no box of its own
|
|
155
|
+
* and is measured through what it rendered.
|
|
156
|
+
*/
|
|
157
|
+
const measureBox = (element) => {
|
|
158
|
+
if (window.getComputedStyle(element).display !== "contents") {
|
|
159
|
+
const rect = element.getBoundingClientRect();
|
|
160
|
+
return rect.width === 0 && rect.height === 0 ? null : rect;
|
|
161
|
+
}
|
|
162
|
+
let box = null;
|
|
163
|
+
for (const child of Array.from(element.children)) {
|
|
164
|
+
const childBox = measureBox(child);
|
|
165
|
+
if (!childBox)
|
|
166
|
+
continue;
|
|
167
|
+
box = box
|
|
168
|
+
? {
|
|
169
|
+
top: Math.min(box.top, childBox.top),
|
|
170
|
+
bottom: Math.max(box.bottom, childBox.bottom),
|
|
171
|
+
left: Math.min(box.left, childBox.left),
|
|
172
|
+
right: Math.max(box.right, childBox.right),
|
|
173
|
+
}
|
|
174
|
+
: childBox;
|
|
175
|
+
}
|
|
176
|
+
return box;
|
|
177
|
+
};
|
|
178
|
+
/**
|
|
179
|
+
* The edited page's element: the outermost node element on the canvas. (Not
|
|
180
|
+
* "a node with no parent": while a composition is edited the page node is
|
|
181
|
+
* parented to the spec's root node.) An embedded section's own page always
|
|
182
|
+
* sits inside a node of the outer page, so it is never the outermost.
|
|
183
|
+
*/
|
|
184
|
+
const findPageElement = () => {
|
|
185
|
+
const candidates = document.querySelectorAll(`[${COMPOSABLE_DATA_ATTRIBUTES.NODE}]`);
|
|
186
|
+
for (const element of Array.from(candidates)) {
|
|
187
|
+
if (element.parentElement?.closest(`[${COMPOSABLE_DATA_ATTRIBUTES.NODE}]`))
|
|
188
|
+
continue;
|
|
189
|
+
if (ELEMENT_TO_NODE.has(element))
|
|
190
|
+
return element;
|
|
191
|
+
}
|
|
192
|
+
return null;
|
|
193
|
+
};
|
|
194
|
+
const toSiblingDrop = ({ element, box }, direction) => {
|
|
195
|
+
let path;
|
|
196
|
+
try {
|
|
197
|
+
path = findPathForElement(element);
|
|
198
|
+
}
|
|
199
|
+
catch {
|
|
200
|
+
return null;
|
|
201
|
+
}
|
|
202
|
+
const { top, bottom, left, right } = box;
|
|
203
|
+
return {
|
|
204
|
+
path,
|
|
205
|
+
direction,
|
|
206
|
+
nodeBoundingBox: new DOMRect(left, top, right - left, bottom - top),
|
|
207
|
+
shouldShowSlotDropzone: false,
|
|
208
|
+
};
|
|
209
|
+
};
|
|
210
|
+
/**
|
|
211
|
+
* The horizontal extent of the box the composition renders into: the nearest
|
|
212
|
+
* ancestor of the page element that has a box of its own. A customer sidebar
|
|
213
|
+
* or page margin lies outside it; the blank space beside a narrow component
|
|
214
|
+
* lies inside it. Null when that box has no width (e.g. not laid out).
|
|
215
|
+
*/
|
|
216
|
+
const findCompositionColumn = (pageElement) => {
|
|
217
|
+
let element = pageElement.parentElement;
|
|
218
|
+
while (element && window.getComputedStyle(element).display === "contents") {
|
|
219
|
+
element = element.parentElement;
|
|
220
|
+
}
|
|
221
|
+
if (!element)
|
|
222
|
+
return null;
|
|
223
|
+
const rect = element.getBoundingClientRect();
|
|
224
|
+
return rect.width > 0 ? { left: rect.left, right: rect.right } : null;
|
|
225
|
+
};
|
|
226
|
+
/** How far `y` is from a box vertically; 0 when level with it. */
|
|
227
|
+
const verticalDistance = (box, y) => y < box.top ? box.top - y : y > box.bottom ? y - box.bottom : 0;
|
|
228
|
+
/** How far `x` is from a box horizontally; 0 when within it. */
|
|
229
|
+
const horizontalDistance = (box, x) => x < box.left ? box.left - x : x > box.right ? x - box.right : 0;
|
|
230
|
+
/**
|
|
231
|
+
* A drag above, below or beside the page's top-level components.
|
|
232
|
+
*
|
|
233
|
+
* The page node is `display: contents`, so the space around its children
|
|
234
|
+
* belongs to no node: the hit test finds nothing there and the author got no
|
|
235
|
+
* drop line until they dragged right onto a component. That space is often the
|
|
236
|
+
* customer's own page around the composition — a site header above it, a
|
|
237
|
+
* footer below it, a sidebar beside it — so:
|
|
238
|
+
*
|
|
239
|
+
* - above the topmost top-level component drops before it (start of the page);
|
|
240
|
+
* - below the lowest drops after it (end of the page);
|
|
241
|
+
* - beside the components, level with one, drops on that component's left or
|
|
242
|
+
* right edge (whichever side the pointer is on), which Studio turns into a
|
|
243
|
+
* side-by-side Columns wrap, like a drop on that edge itself. That covers a
|
|
244
|
+
* customer sidebar or page margin outside the box the composition renders
|
|
245
|
+
* into, and the blank space beside a narrower component (a Button) inside it;
|
|
246
|
+
* - outside that box but level with a gap between rows, the side drop goes to
|
|
247
|
+
* the nearest component vertically.
|
|
248
|
+
*
|
|
249
|
+
* Each is the same drop as that component's edge, so Studio draws the usual
|
|
250
|
+
* line. Positions are where components sit on screen, not document order, and
|
|
251
|
+
* every rendered copy of a Repeater counts.
|
|
252
|
+
*
|
|
253
|
+
* Gaps between rows inside the composition's own column (margins) are
|
|
254
|
+
* deliberately not covered.
|
|
255
|
+
*/
|
|
256
|
+
const getOutsideComponentsHitboxDetails = (event) => {
|
|
257
|
+
const pageElement = findPageElement();
|
|
258
|
+
if (!pageElement)
|
|
259
|
+
return null;
|
|
260
|
+
const pageNode = ELEMENT_TO_NODE.get(pageElement);
|
|
261
|
+
if (!pageNode?.slots)
|
|
262
|
+
return null;
|
|
263
|
+
const placed = [];
|
|
264
|
+
for (const child of Object.values(pageNode.slots).flat()) {
|
|
265
|
+
for (const element of getComposableElements(child.uid)) {
|
|
266
|
+
const box = measureBox(element);
|
|
267
|
+
if (box)
|
|
268
|
+
placed.push({ element, box });
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
if (placed.length === 0)
|
|
272
|
+
return null;
|
|
273
|
+
const { clientX: x, clientY: y } = event;
|
|
274
|
+
const topmost = placed.reduce((a, b) => (b.box.top < a.box.top ? b : a));
|
|
275
|
+
const lowest = placed.reduce((a, b) => (b.box.bottom > a.box.bottom ? b : a));
|
|
276
|
+
if (y < topmost.box.top)
|
|
277
|
+
return toSiblingDrop(topmost, "top");
|
|
278
|
+
if (y > lowest.box.bottom)
|
|
279
|
+
return toSiblingDrop(lowest, "bottom");
|
|
280
|
+
// The composition's own column: the box it renders into (the page element is
|
|
281
|
+
// `display: contents`), falling back to the components' combined width.
|
|
282
|
+
const column = findCompositionColumn(pageElement) ?? {
|
|
283
|
+
left: Math.min(...placed.map((p) => p.box.left)),
|
|
284
|
+
right: Math.max(...placed.map((p) => p.box.right)),
|
|
285
|
+
};
|
|
286
|
+
const isBesideComposition = x < column.left || x > column.right;
|
|
287
|
+
if (!isBesideComposition) {
|
|
288
|
+
// Inside the composition's column: only blank space level with a
|
|
289
|
+
// narrower component counts, as a side-by-side drop on its nearer edge.
|
|
290
|
+
const level = placed.filter((p) => verticalDistance(p.box, y) === 0);
|
|
291
|
+
if (level.length === 0)
|
|
292
|
+
return null;
|
|
293
|
+
const beside = level.reduce((a, b) => horizontalDistance(b.box, x) < horizontalDistance(a.box, x) ? b : a);
|
|
294
|
+
if (x > beside.box.right)
|
|
295
|
+
return toSiblingDrop(beside, "right");
|
|
296
|
+
if (x < beside.box.left)
|
|
297
|
+
return toSiblingDrop(beside, "left");
|
|
298
|
+
return null;
|
|
299
|
+
}
|
|
300
|
+
// Beside the whole composition (a sidebar, a page margin): the component
|
|
301
|
+
// level with the pointer, or the closest one vertically, on the side the
|
|
302
|
+
// pointer is on.
|
|
303
|
+
const nearest = placed.reduce((a, b) => {
|
|
304
|
+
const da = verticalDistance(a.box, y);
|
|
305
|
+
const db = verticalDistance(b.box, y);
|
|
306
|
+
if (db !== da)
|
|
307
|
+
return db < da ? b : a;
|
|
308
|
+
return horizontalDistance(b.box, x) < horizontalDistance(a.box, x) ? b : a;
|
|
309
|
+
});
|
|
310
|
+
return toSiblingDrop(nearest, x < nearest.box.left ? "left" : "right");
|
|
311
|
+
};
|
|
152
312
|
/**
|
|
153
313
|
* Where a drag at this event would drop. Same as `getHitboxDetails`, except a
|
|
154
|
-
* permanent drop zone also wins in the edge band around it
|
|
314
|
+
* permanent drop zone also wins in the edge band around it, and a drag above,
|
|
315
|
+
* below or beside the components drops next to the right one. Presses use
|
|
155
316
|
* `getHitboxDetails`, so a click near a zone still selects what it lands on.
|
|
156
317
|
*/
|
|
157
318
|
const getDropTargetHitboxDetails = (event) => {
|
|
158
319
|
const targetedZone = findTargetedPermanentDropZone(event.clientX, event.clientY);
|
|
159
320
|
if (targetedZone)
|
|
160
321
|
return getPermanentDropZoneHitboxDetails(targetedZone);
|
|
161
|
-
return getHitboxDetails(event);
|
|
322
|
+
return getHitboxDetails(event) ?? getOutsideComponentsHitboxDetails(event);
|
|
162
323
|
};
|
|
163
324
|
function toCamelCase(property) {
|
|
164
325
|
return property.replace(/-([a-z])/g, (match, letter) => letter.toUpperCase());
|
|
@@ -189,5 +350,5 @@ const serializeEvent = (event) => {
|
|
|
189
350
|
};
|
|
190
351
|
};
|
|
191
352
|
|
|
192
|
-
export { findNearestBuilderNode, findNearestSlotNode, findTargetedPermanentDropZone, getComposableElement, getComposableElements, getComputedStyles, getDropTargetHitboxDetails, getHitboxDetails, getHitboxDirection, hasSlotDropzone, serializeEvent, toggleNodeVisible };
|
|
353
|
+
export { findNearestBuilderNode, findNearestSlotNode, findTargetedPermanentDropZone, getComposableElement, getComposableElements, getComputedStyles, getDropTargetHitboxDetails, getHitboxDetails, getHitboxDirection, getOutsideComponentsHitboxDetails, hasSlotDropzone, serializeEvent, toggleNodeVisible };
|
|
193
354
|
//# sourceMappingURL=canvas.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvas.utils.js","sources":["../../src/canvas/canvas.utils.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"canvas.utils.js","sources":["../../src/canvas/canvas.utils.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
import { findBindingDefects } from '../utils/check-bindings.js';
|
|
2
|
+
import { degradedReportingIsOn, DegradedCode, reportDegraded } from '../utils/degraded-finding.js';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Names the entry a binding reads, for the middle of a sentence.
|
|
6
|
+
*
|
|
7
|
+
* A binding that names its own entry gets the uid and the content type,
|
|
8
|
+
* because in a project with many entries that is the whole of the lookup. A
|
|
9
|
+
* template binding names neither — it reads whichever entry the composition is
|
|
10
|
+
* connected to on this request — so it gets a phrase instead, and the sentence
|
|
11
|
+
* says less rather than printing a stand-in where a uid should be.
|
|
12
|
+
*/
|
|
13
|
+
function describeBindingSubject(defect) {
|
|
14
|
+
if (!defect.entryUid || !defect.contentTypeUid) {
|
|
15
|
+
return "the entry this composition is connected to";
|
|
16
|
+
}
|
|
17
|
+
return `entry ${defect.entryUid} of "${defect.contentTypeUid}"`;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Says which bindings will render blank, and why.
|
|
21
|
+
*
|
|
22
|
+
* Walks every binding on the page, so it is skipped outright unless somebody
|
|
23
|
+
* will read the result.
|
|
24
|
+
*
|
|
25
|
+
* The missing-path case carries two causes and asserts neither, and that is
|
|
26
|
+
* the rule for this whole group rather than a hedge. We hold the entry, not
|
|
27
|
+
* the content type's schema, so a field that was renamed and a field the
|
|
28
|
+
* author simply has not filled in are the same absence from here. Picking one
|
|
29
|
+
* would send half of these readers to change something that is correct.
|
|
30
|
+
*/
|
|
31
|
+
function reportBindingDefects(config, pageUi, dataSources, request) {
|
|
32
|
+
if (!degradedReportingIsOn(config))
|
|
33
|
+
return;
|
|
34
|
+
for (const defect of findBindingDefects(pageUi, dataSources, request)) {
|
|
35
|
+
if (defect.code === DegradedCode.PREVIEW_ASSET_PROJECTION_NULL) {
|
|
36
|
+
reportDegraded({
|
|
37
|
+
code: DegradedCode.PREVIEW_ASSET_PROJECTION_NULL,
|
|
38
|
+
headline: `The asset at "${defect.path}" on ` +
|
|
39
|
+
describeBindingSubject(defect) +
|
|
40
|
+
" came back empty from the preview service. The same request " +
|
|
41
|
+
"returns it from the published CDN.",
|
|
42
|
+
causes: [
|
|
43
|
+
{
|
|
44
|
+
cause: "A known Preview API defect empties an asset asked for by a " +
|
|
45
|
+
"dotted path when a modular-blocks field is asked for beside it.",
|
|
46
|
+
fix: "Check the published site before changing anything — the binding is probably fine. Nothing in this project fixes it.",
|
|
47
|
+
},
|
|
48
|
+
{
|
|
49
|
+
cause: "The asset is genuinely not set on this entry.",
|
|
50
|
+
fix: "Set it, or leave it — the binding works either way.",
|
|
51
|
+
},
|
|
52
|
+
],
|
|
53
|
+
findings: {
|
|
54
|
+
path: defect.path,
|
|
55
|
+
entryUid: defect.entryUid,
|
|
56
|
+
contentTypeUid: defect.contentTypeUid,
|
|
57
|
+
},
|
|
58
|
+
}, config);
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
if (defect.code === DegradedCode.BINDING_PATH_MISSING) {
|
|
62
|
+
reportDegraded({
|
|
63
|
+
code: DegradedCode.BINDING_PATH_MISSING,
|
|
64
|
+
headline: `The binding "${defect.path}" does not exist on ` +
|
|
65
|
+
describeBindingSubject(defect) +
|
|
66
|
+
".",
|
|
67
|
+
causes: [
|
|
68
|
+
{
|
|
69
|
+
cause: "The field was renamed or removed on the content type.",
|
|
70
|
+
fix: "Re-point the binding at the field it should read.",
|
|
71
|
+
},
|
|
72
|
+
{
|
|
73
|
+
cause: "The field is there and nobody has filled it in yet.",
|
|
74
|
+
fix: "Nothing to fix here — add the content.",
|
|
75
|
+
},
|
|
76
|
+
],
|
|
77
|
+
findings: {
|
|
78
|
+
path: defect.path,
|
|
79
|
+
entryUid: defect.entryUid,
|
|
80
|
+
contentTypeUid: defect.contentTypeUid,
|
|
81
|
+
},
|
|
82
|
+
}, config);
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
reportDegraded({
|
|
86
|
+
code: DegradedCode.BINDING_SHAPE_MISMATCH,
|
|
87
|
+
headline: `The binding "${defect.path}" reads a single value and resolved ` +
|
|
88
|
+
`to a ${defect.resolvedTo}.`,
|
|
89
|
+
causes: [
|
|
90
|
+
{
|
|
91
|
+
cause: "The binding points at a container rather than at a field inside it.",
|
|
92
|
+
fix: `Point it at a field within "${defect.path}".`,
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
findings: {
|
|
96
|
+
path: defect.path,
|
|
97
|
+
entryUid: defect.entryUid,
|
|
98
|
+
contentTypeUid: defect.contentTypeUid,
|
|
99
|
+
resolvedTo: defect.resolvedTo,
|
|
100
|
+
},
|
|
101
|
+
}, config);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
export { reportBindingDefects };
|
|
106
|
+
//# sourceMappingURL=binding-defect-report.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"binding-defect-report.js","sources":["../../src/composable-studio/binding-defect-report.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -74,6 +74,23 @@ function getScopedData(obj, selectedField, entriesByKey) {
|
|
|
74
74
|
}
|
|
75
75
|
return traversed ?? null;
|
|
76
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* The part of `template` a section reads: walk `selectedField` into it as the
|
|
79
|
+
* deployed site does (a list without an index gives its first item), then
|
|
80
|
+
* collapse a single-element section's list to that one element.
|
|
81
|
+
*
|
|
82
|
+
* The collapse is the deploy default — the preview instance is session-only and
|
|
83
|
+
* not persisted. A section inside a page repeater is re-scoped from the live
|
|
84
|
+
* iteration item by the provider, so this value is only its bare-placement
|
|
85
|
+
* fallback.
|
|
86
|
+
*/
|
|
87
|
+
function scopeTemplateToSection(template, selectedField, cardinality, entriesByKey) {
|
|
88
|
+
const scoped = getScopedData(template, selectedField, entriesByKey);
|
|
89
|
+
if (cardinality === "single" && Array.isArray(scoped)) {
|
|
90
|
+
return scoped[0] ?? null;
|
|
91
|
+
}
|
|
92
|
+
return scoped;
|
|
93
|
+
}
|
|
77
94
|
function applyUidRemapping(scoped, uidRemapping = {}) {
|
|
78
95
|
if (!scoped ||
|
|
79
96
|
typeof scoped !== "object" ||
|
|
@@ -155,16 +172,9 @@ function buildScopedDataSources(pool, needsBySection, pageDataSources) {
|
|
|
155
172
|
console.warn(`buildScopedDataSources: no pooled entry for section data ${fetchRootKey} (instance ${instanceUid})`);
|
|
156
173
|
}
|
|
157
174
|
}
|
|
158
|
-
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
-
// default — the preview instance is session-only and not persisted). When
|
|
162
|
-
// placed inside a page repeater, `parentRepeaterUID` is set and the provider
|
|
163
|
-
// re-scopes template from the live iteration item, so this baked value is
|
|
164
|
-
// only the bare-placement fallback.
|
|
165
|
-
if (needs.cardinality === "single" && Array.isArray(scopedTemplate)) {
|
|
166
|
-
scopedTemplate = scopedTemplate[0] ?? null;
|
|
167
|
-
}
|
|
175
|
+
// Remapping goes item by item, so collapsing a single-element list first
|
|
176
|
+
// gives the same result as collapsing after.
|
|
177
|
+
const scopedTemplate = applyUidRemapping(scopeTemplateToSection(rootDocument, rootScopePath, needs.cardinality, pool.entriesByKey), needs.uidRemapping);
|
|
168
178
|
let repeater;
|
|
169
179
|
if (needs.parentRepeaterUID) {
|
|
170
180
|
const ctx = pageDataSources.repeater?.[needs.parentRepeaterUID];
|
|
@@ -198,5 +208,5 @@ function buildScopedDataSources(pool, needsBySection, pageDataSources) {
|
|
|
198
208
|
return out;
|
|
199
209
|
}
|
|
200
210
|
|
|
201
|
-
export { buildScopedDataSources };
|
|
211
|
+
export { buildScopedDataSources, scopeTemplateToSection };
|
|
202
212
|
//# sourceMappingURL=build-scoped-data.js.map
|
|
@@ -1 +1 @@
|
|
|
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
|
+
{"version":3,"file":"build-scoped-data.js","sources":["../../src/composable-studio/build-scoped-data.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { resolveMatchedSchema, fetchRootFromBinding, templateFetchRoot } from './section-data.js';
|
|
2
|
-
import { indexSectionSlotContexts } from '
|
|
2
|
+
import { indexSectionSlotContexts } from '@contentstack/studio-internal';
|
|
3
3
|
|
|
4
4
|
const SECTION_COMPOSITION_NODE_TYPE = "section-composition";
|
|
5
5
|
/**
|
|
@@ -1,3 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `JSON.parse` that reports unreadable input as `undefined` instead of
|
|
3
|
+
* throwing. `JSON.parse` can never itself yield `undefined`, so it is an
|
|
4
|
+
* unambiguous "could not read this" signal.
|
|
5
|
+
*
|
|
6
|
+
* The try covers only the parse. Widening it would also swallow throws from
|
|
7
|
+
* the shape check and item mapping below, turning an unrelated bug into a
|
|
8
|
+
* silently dropped binding with a misleading warning.
|
|
9
|
+
*/
|
|
10
|
+
function tryParseJson(value) {
|
|
11
|
+
try {
|
|
12
|
+
return JSON.parse(value);
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Whether a parsed value matches the bucket it was stored under. A value that
|
|
20
|
+
* was stringified twice parses back to a string rather than a list or an
|
|
21
|
+
* object, which is the shape this rejects.
|
|
22
|
+
*
|
|
23
|
+
* `null` is accepted for `object` because the bucket is chosen from the
|
|
24
|
+
* prop's declared type, not from the value, so an object-typed prop with no
|
|
25
|
+
* value legitimately stores `null`. It is rejected for `array` because
|
|
26
|
+
* mapping over it used to throw.
|
|
27
|
+
*/
|
|
28
|
+
function matchesDataType(dataType, value) {
|
|
29
|
+
if (dataType === "array")
|
|
30
|
+
return Array.isArray(value);
|
|
31
|
+
return value === null || (typeof value === "object" && !Array.isArray(value));
|
|
32
|
+
}
|
|
33
|
+
const warnedStaticValues = new Set();
|
|
34
|
+
/**
|
|
35
|
+
* Reads a structured (array/object) static value, which the compositions CT
|
|
36
|
+
* stores as a JSON string. An API client can also write the value itself
|
|
37
|
+
* rather than its JSON text, so a non-string value skips the parse and is
|
|
38
|
+
* shape-checked as it is.
|
|
39
|
+
*
|
|
40
|
+
* Returns `undefined` rather than throwing when the stored value is
|
|
41
|
+
* unreadable or has the wrong shape. This runs while a composition's data is
|
|
42
|
+
* being built, so a throw fails the whole page instead of the single binding
|
|
43
|
+
* holding the bad value; the key is left out and that binding falls back to
|
|
44
|
+
* its component default.
|
|
45
|
+
*
|
|
46
|
+
* An unset prop and a corrupt one are deliberately different. Unset is an
|
|
47
|
+
* authored state with a defined answer, an empty list or object, so it is
|
|
48
|
+
* silent. Unreadable is corruption with no correct answer, so it warns - once
|
|
49
|
+
* per key, because callers re-read the whole bucket on every author edit.
|
|
50
|
+
*/
|
|
51
|
+
function readStructuredValue(dataType, key, value) {
|
|
52
|
+
if (value === undefined || value === null || value === "") {
|
|
53
|
+
return dataType === "array" ? [] : {};
|
|
54
|
+
}
|
|
55
|
+
const parsed = typeof value === "string" ? tryParseJson(value) : value;
|
|
56
|
+
if (matchesDataType(dataType, parsed))
|
|
57
|
+
return parsed;
|
|
58
|
+
const warnedKey = `${dataType}:${key}`;
|
|
59
|
+
if (!warnedStaticValues.has(warnedKey)) {
|
|
60
|
+
warnedStaticValues.add(warnedKey);
|
|
61
|
+
console.warn(`[Composable Studio SDK] Ignoring ${dataType} static value "${key}": the stored value could not be read as ${dataType === "array" ? "a list" : "an object"}. The binding falls back to its component default.`);
|
|
62
|
+
}
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
1
65
|
/**
|
|
2
66
|
* Processes the raw static values and stored them against their static value UID.
|
|
3
67
|
*
|
|
@@ -31,34 +95,40 @@ function preProcessStaticValues(rawStaticValues) {
|
|
|
31
95
|
// it as a JSON string. Parse before processing — otherwise Object.entries
|
|
32
96
|
// iterates string characters and every static value is silently dropped.
|
|
33
97
|
if (typeof rawStaticValues === "string") {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
catch {
|
|
38
|
-
return {};
|
|
39
|
-
}
|
|
40
|
-
if (!rawStaticValues || typeof rawStaticValues !== "object")
|
|
98
|
+
const parsed = tryParseJson(rawStaticValues);
|
|
99
|
+
if (!parsed || typeof parsed !== "object")
|
|
41
100
|
return {};
|
|
101
|
+
rawStaticValues = parsed;
|
|
42
102
|
}
|
|
43
103
|
const processedStaticValues = {};
|
|
104
|
+
if (typeof rawStaticValues !== "object" || Array.isArray(rawStaticValues)) {
|
|
105
|
+
return processedStaticValues;
|
|
106
|
+
}
|
|
44
107
|
Object.entries(rawStaticValues).forEach(([dataType, staticContent]) => {
|
|
45
108
|
if (!Array.isArray(staticContent))
|
|
46
109
|
return;
|
|
47
110
|
for (const staticItem of staticContent) {
|
|
48
|
-
|
|
49
|
-
|
|
111
|
+
// An item without a string key cannot be bound to: skip it.
|
|
112
|
+
if (!staticItem ||
|
|
113
|
+
typeof staticItem !== "object" ||
|
|
114
|
+
typeof staticItem.key !== "string") {
|
|
50
115
|
continue;
|
|
51
116
|
}
|
|
52
|
-
if (dataType === "array") {
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
117
|
+
if (dataType === "object" || dataType === "array") {
|
|
118
|
+
const parsed = readStructuredValue(dataType, staticItem.key, staticItem.value);
|
|
119
|
+
if (parsed === undefined)
|
|
120
|
+
continue;
|
|
121
|
+
processedStaticValues[staticItem.key] =
|
|
122
|
+
dataType === "array"
|
|
123
|
+
? parsed
|
|
124
|
+
.map((item) => {
|
|
125
|
+
const parsedItem = parseStringValue(item);
|
|
126
|
+
if (parsedItem.isValid) {
|
|
127
|
+
return parsedItem.value;
|
|
128
|
+
}
|
|
129
|
+
})
|
|
130
|
+
.filter(Boolean)
|
|
131
|
+
: parsed;
|
|
62
132
|
continue;
|
|
63
133
|
}
|
|
64
134
|
if (dataType === "any" || dataType === "json_rte") {
|