@lostgradient/cinder 0.24.6 → 0.24.7
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/CHANGELOG.md +18 -0
- package/components.json +1 -1
- package/dist/components/accordion-item/accordion-item.css +2 -1
- package/dist/components/alert-dialog/index.js +52 -5
- package/dist/components/approval-card/index.js +52 -5
- package/dist/components/area-chart/area-chart.css +4 -2
- package/dist/components/autocomplete/index.js +52 -5
- package/dist/components/avatar-group/index.js +52 -5
- package/dist/components/backdrop/backdrop.css +6 -1
- package/dist/components/backdrop/index.js +52 -5
- package/dist/components/badge/badge.css +6 -6
- package/dist/components/banner/banner.css +13 -0
- package/dist/components/bar-chart/bar-chart.css +2 -1
- package/dist/components/carousel/carousel.css +14 -1
- package/dist/components/carousel/index.js +52 -5
- package/dist/components/chip/chip.css +7 -7
- package/dist/components/collapsible/collapsible.css +2 -1
- package/dist/components/collapsible/index.js +52 -5
- package/dist/components/color-swatch-picker/color-swatch-picker.css +14 -0
- package/dist/components/combobox/index.js +52 -5
- package/dist/components/command-menu/index.js +52 -5
- package/dist/components/command-palette/command-palette.css +30 -19
- package/dist/components/confirm-dialog/index.js +52 -5
- package/dist/components/connection-indicator/connection-indicator.css +7 -3
- package/dist/components/context-menu/index.js +52 -5
- package/dist/components/date-picker/index.js +52 -5
- package/dist/components/date-range-field/index.js +52 -5
- package/dist/components/drawer/drawer.css +4 -2
- package/dist/components/drawer/index.js +52 -5
- package/dist/components/dropdown/dropdown.css +7 -1
- package/dist/components/dropdown/index.js +52 -5
- package/dist/components/dropdown-menu/index.js +52 -5
- package/dist/components/feed/feed.css +2 -1
- package/dist/components/file-upload/file-upload.css +4 -2
- package/dist/components/hover-card/hover-card.css +2 -1
- package/dist/components/hover-card/index.js +52 -5
- package/dist/components/invocation-rule-builder/index.js +52 -5
- package/dist/components/json-schema-editor/enum-composition.d.ts +35 -0
- package/dist/components/json-schema-editor/enum-editor.svelte.d.ts +23 -0
- package/dist/components/json-schema-editor/form-view.svelte.d.ts +5 -0
- package/dist/components/json-schema-editor/index.js +2178 -1330
- package/dist/components/json-schema-editor/json-schema-editor.css +68 -35
- package/dist/components/json-schema-editor/json-view.svelte.d.ts +1 -0
- package/dist/components/json-schema-editor/property-editor.svelte.d.ts +6 -0
- package/dist/components/json-schema-editor/property-list.svelte.d.ts +6 -0
- package/dist/components/json-viewer/json-viewer.css +2 -1
- package/dist/components/kanban-board/kanban-board.css +14 -2
- package/dist/components/line-chart/line-chart.css +2 -1
- package/dist/components/load-more/load-more.css +5 -0
- package/dist/components/marquee/marquee.css +21 -3
- package/dist/components/media-controls/media-controls.css +2 -1
- package/dist/components/mega-menu/mega-menu.css +6 -3
- package/dist/components/menu-bar/index.js +52 -5
- package/dist/components/meter/meter.css +2 -1
- package/dist/components/modal/index.js +52 -5
- package/dist/components/modal/modal.css +4 -2
- package/dist/components/multi-select/index.js +52 -5
- package/dist/components/navigation-bar/index.js +52 -5
- package/dist/components/navigation-bar/navigation-bar.css +2 -1
- package/dist/components/pagination/pagination.css +4 -2
- package/dist/components/popover/index.js +52 -5
- package/dist/components/popover/popover.css +2 -1
- package/dist/components/portal/index.js +52 -5
- package/dist/components/progress/progress.css +41 -4
- package/dist/components/run-step-timeline/index.js +52 -5
- package/dist/components/scroll-area/index.js +52 -5
- package/dist/components/scroll-area/scroll-area.css +12 -0
- package/dist/components/selection-popover/index.js +52 -5
- package/dist/components/selection-popover/selection-popover.css +2 -1
- package/dist/components/side-navigation-group/side-navigation-group.css +2 -1
- package/dist/components/sidebar/index.js +52 -5
- package/dist/components/skeleton/skeleton.css +7 -1
- package/dist/components/skip-link/index.js +52 -5
- package/dist/components/slider/slider.css +4 -2
- package/dist/components/sortable-list/sortable-list.css +6 -3
- package/dist/components/sparkbar/sparkbar.css +2 -1
- package/dist/components/speed-dial/index.js +52 -5
- package/dist/components/speed-dial/speed-dial.css +2 -1
- package/dist/components/speed-dial-action/index.js +52 -5
- package/dist/components/spinner/spinner.css +15 -2
- package/dist/components/spinner/spinner.variables.js +2 -2
- package/dist/components/status-dot/status-dot.css +3 -1
- package/dist/components/table-of-contents/index.js +52 -5
- package/dist/components/table-of-contents/table-of-contents.css +2 -1
- package/dist/components/toast-region/index.js +52 -5
- package/dist/components/toast-region/toast-region.css +5 -3
- package/dist/components/toggle/toggle.css +3 -2
- package/dist/components/toolbar/toolbar.css +1 -1
- package/dist/components/tooltip/index.js +52 -5
- package/dist/components/tooltip/tooltip.css +2 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.js +11816 -10919
- package/dist/server/components/alert-dialog/index.js +3 -3
- package/dist/server/components/approval-card/index.js +6 -6
- package/dist/server/components/autocomplete/index.js +5 -5
- package/dist/server/components/avatar-group/index.js +5 -5
- package/dist/server/components/backdrop/index.js +2 -2
- package/dist/server/components/carousel/index.js +2 -2
- package/dist/server/components/collapsible/index.js +3 -3
- package/dist/server/components/combobox/index.js +6 -6
- package/dist/server/components/command-menu/index.js +4 -4
- package/dist/server/components/confirm-dialog/index.js +3 -3
- package/dist/server/components/context-menu/index.js +5 -5
- package/dist/server/components/date-picker/index.js +6 -6
- package/dist/server/components/date-range-field/index.js +6 -6
- package/dist/server/components/drawer/index.js +3 -3
- package/dist/server/components/dropdown/index.js +5 -5
- package/dist/server/components/dropdown-menu/index.js +5 -5
- package/dist/server/components/hover-card/index.js +4 -4
- package/dist/server/components/invocation-rule-builder/index.js +6 -6
- package/dist/server/components/json-schema-editor/index.js +1 -1
- package/dist/server/components/menu-bar/index.js +5 -5
- package/dist/server/components/modal/index.js +3 -3
- package/dist/server/components/multi-select/index.js +4 -4
- package/dist/server/components/navigation-bar/index.js +4 -4
- package/dist/server/components/popover/index.js +5 -5
- package/dist/server/components/portal/index.js +3 -3
- package/dist/server/components/run-step-timeline/index.js +3 -3
- package/dist/server/components/scroll-area/index.js +2 -2
- package/dist/server/components/selection-popover/index.js +4 -4
- package/dist/server/components/sidebar/index.js +3 -3
- package/dist/server/components/skip-link/index.js +2 -2
- package/dist/server/components/speed-dial/index.js +5 -5
- package/dist/server/components/speed-dial-action/index.js +4 -4
- package/dist/server/components/table-of-contents/index.js +2 -2
- package/dist/server/components/toast-region/index.js +2 -2
- package/dist/server/components/tooltip/index.js +5 -5
- package/dist/server/index.js +53 -47
- package/dist/server/{index.server-mf4dr1kp.js → index.server-05fjyh64.js} +1 -1
- package/dist/server/{index.server-9m7bqtev.js → index.server-0sgd56wv.js} +1 -1
- package/dist/server/{index.server-8bv9bkm6.js → index.server-0v25zb5x.js} +1 -1
- package/dist/server/index.server-0xcc5k8g.js +65 -0
- package/dist/server/{index.server-0yrz8ryn.js → index.server-2dx3cghn.js} +1 -1
- package/dist/server/{index.server-bw1wbzzk.js → index.server-2yytkmt5.js} +1 -1
- package/dist/server/{index.server-0qa6j0gt.js → index.server-30gx9zg5.js} +1 -1
- package/dist/server/{index.server-zbgdfzy6.js → index.server-32dx3e3d.js} +1 -1
- package/dist/server/{index.server-0d1703dw.js → index.server-43hv4eth.js} +1 -1
- package/dist/server/{index.server-aphnpg78.js → index.server-4rref2gd.js} +1 -1
- package/dist/server/{index.server-7vzk6qhf.js → index.server-6t4zmzm9.js} +1 -1
- package/dist/server/{index.server-6kf969a0.js → index.server-6wj3ce1b.js} +1 -1
- package/dist/server/{index.server-6vd98s4m.js → index.server-71y23tjr.js} +1 -1
- package/dist/server/{index.server-ppw26tpq.js → index.server-76bazvez.js} +1 -1
- package/dist/server/{index.server-4entcat5.js → index.server-780qs6bf.js} +896 -216
- package/dist/server/{index.server-w20xg416.js → index.server-993j9d6k.js} +1 -1
- package/dist/server/{index.server-dw9bz17h.js → index.server-ahj2t130.js} +1 -1
- package/dist/server/{index.server-8xr5tbrn.js → index.server-ce4s0zq6.js} +1 -1
- package/dist/server/{index.server-tpny5pjk.js → index.server-crrj0ef1.js} +1 -1
- package/dist/server/{index.server-zj0x74bt.js → index.server-d4j8rztt.js} +1 -1
- package/dist/server/{index.server-a8gpnzgg.js → index.server-e2jq5490.js} +1 -1
- package/dist/server/{index.server-0dny4mhe.js → index.server-ehpdbjjt.js} +1 -1
- package/dist/server/{index.server-k21nfvxe.js → index.server-er0ge1w2.js} +3 -3
- package/dist/server/{index.server-p69bvf14.js → index.server-etg48ham.js} +1 -1
- package/dist/server/{index.server-s4pfz6pb.js → index.server-fdnzb16k.js} +1 -1
- package/dist/server/{index.server-b8m7ej8c.js → index.server-g8ehn08w.js} +1 -1
- package/dist/server/{index.server-ykvb4rcc.js → index.server-gg1jyyfe.js} +1 -1
- package/dist/server/{index.server-emqv9bz6.js → index.server-jd43fwkh.js} +1 -1
- package/dist/server/{index.server-zg0981gk.js → index.server-kk17whw8.js} +1 -1
- package/dist/server/{index.server-aywvs10h.js → index.server-n2s42qb6.js} +2 -2
- package/dist/server/{index.server-kszs0qx5.js → index.server-pp705ba7.js} +1 -1
- package/dist/server/{index.server-tkt7wm9w.js → index.server-qe7sgzpf.js} +1 -1
- package/dist/server/{index.server-hvp84h1d.js → index.server-qr1nsjzm.js} +1 -1
- package/dist/server/{index.server-jxcxe1sp.js → index.server-ras33ac4.js} +1 -1
- package/dist/server/{index.server-ye5xkaq2.js → index.server-sf0g2t1a.js} +1 -1
- package/dist/server/{index.server-h76gdmj1.js → index.server-tc9n0rwa.js} +1 -1
- package/dist/server/{index.server-j6wms88v.js → index.server-v4pecbt0.js} +2 -2
- package/dist/server/{index.server-bjj2hpx1.js → index.server-wdy49qrf.js} +1 -1
- package/dist/server/{index.server-cmz3t3zw.js → index.server-wk2ms64s.js} +1 -1
- package/dist/server/{index.server-spdds2hk.js → index.server-wksxfr9e.js} +1 -1
- package/dist/server/{index.server-zkhc16nf.js → index.server-wpdhc0y0.js} +1 -1
- package/dist/server/{index.server-c6namd71.js → index.server-wv9xge03.js} +1 -1
- package/dist/server/{index.server-d7twz1zm.js → index.server-xdqd2dvc.js} +1 -1
- package/dist/server/{index.server-d05m93p4.js → index.server-yty4hdcv.js} +1 -1
- package/dist/server/{index.server-936tfc73.js → index.server-zg7ctrjh.js} +1 -1
- package/dist/server/{index.server-nsdh6zgh.js → index.server-zwv8mamh.js} +1 -1
- package/dist/utilities/use-reduced-motion.svelte.d.ts +12 -1
- package/dist/utilities/use-reduced-motion.types.d.ts +1 -0
- package/package.json +1 -1
- package/src/components/accordion-item/accordion-item.css +2 -1
- package/src/components/area-chart/area-chart.css +4 -2
- package/src/components/backdrop/backdrop.css +6 -1
- package/src/components/badge/badge.css +6 -6
- package/src/components/banner/banner.css +13 -0
- package/src/components/bar-chart/bar-chart.css +2 -1
- package/src/components/carousel/carousel.css +14 -1
- package/src/components/chip/chip.css +7 -7
- package/src/components/collapsible/collapsible.css +2 -1
- package/src/components/color-swatch-picker/color-swatch-picker.css +14 -0
- package/src/components/command-palette/command-palette.css +30 -19
- package/src/components/connection-indicator/connection-indicator.css +7 -3
- package/src/components/drawer/drawer.css +4 -2
- package/src/components/dropdown/dropdown.css +7 -1
- package/src/components/feed/feed.css +2 -1
- package/src/components/file-upload/file-upload.css +4 -2
- package/src/components/hover-card/hover-card.css +2 -1
- package/src/components/json-schema-editor/enum-composition.ts +77 -0
- package/src/components/json-schema-editor/enum-editor.svelte +293 -0
- package/src/components/json-schema-editor/form-view.svelte +5 -2
- package/src/components/json-schema-editor/json-schema-editor-impl.svelte +17 -1
- package/src/components/json-schema-editor/json-schema-editor.css +68 -35
- package/src/components/json-schema-editor/json-view.svelte +6 -7
- package/src/components/json-schema-editor/property-editor.constants.ts +1 -0
- package/src/components/json-schema-editor/property-editor.svelte +182 -23
- package/src/components/json-schema-editor/property-list.svelte +201 -130
- package/src/components/json-viewer/json-viewer.css +2 -1
- package/src/components/kanban-board/kanban-board.css +14 -2
- package/src/components/line-chart/line-chart.css +2 -1
- package/src/components/load-more/load-more.css +5 -0
- package/src/components/marquee/marquee.css +21 -3
- package/src/components/media-controls/media-controls.css +2 -1
- package/src/components/mega-menu/mega-menu.css +6 -3
- package/src/components/meter/meter.css +2 -1
- package/src/components/modal/modal.css +4 -2
- package/src/components/navigation-bar/navigation-bar.css +2 -1
- package/src/components/pagination/pagination.css +4 -2
- package/src/components/popover/popover.css +2 -1
- package/src/components/progress/progress.css +41 -4
- package/src/components/scroll-area/scroll-area.css +12 -0
- package/src/components/selection-popover/selection-popover.css +2 -1
- package/src/components/side-navigation-group/side-navigation-group.css +2 -1
- package/src/components/skeleton/skeleton.css +7 -1
- package/src/components/slider/slider.css +4 -2
- package/src/components/sortable-list/sortable-list.css +6 -3
- package/src/components/sparkbar/sparkbar.css +2 -1
- package/src/components/speed-dial/speed-dial.css +2 -1
- package/src/components/spinner/spinner.css +15 -2
- package/src/components/spinner/spinner.variables.json +1 -1
- package/src/components/spinner/spinner.variables.ts +1 -1
- package/src/components/status-dot/status-dot.css +3 -1
- package/src/components/table-of-contents/table-of-contents.css +2 -1
- package/src/components/toast-region/toast-region.css +5 -3
- package/src/components/toggle/toggle.css +3 -2
- package/src/components/toolbar/toolbar.css +1 -1
- package/src/components/tooltip/tooltip.css +2 -1
- package/src/index.ts +9 -2
- package/src/styles/foundation.css +18 -3
- package/src/styles/tokens-base.css +172 -30
- package/src/utilities/use-reduced-motion.svelte.ts +63 -4
- package/src/utilities/use-reduced-motion.types.ts +2 -0
- package/dist/server/index.server-8hdvr9bt.js +0 -18
|
@@ -160,17 +160,17 @@
|
|
|
160
160
|
color: var(--cinder-text-subtle);
|
|
161
161
|
}
|
|
162
162
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
.cinder-jse-property-row {
|
|
163
|
+
.cinder-jse-property-table {
|
|
164
|
+
inline-size: 100%;
|
|
165
|
+
border-collapse: collapse;
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
.cinder-jse-property-row > .cinder-table__cell {
|
|
169
169
|
border-top: 1px solid var(--cinder-border-muted);
|
|
170
170
|
background: transparent;
|
|
171
171
|
}
|
|
172
172
|
|
|
173
|
-
.cinder-jse-property-row:first-child {
|
|
173
|
+
.cinder-jse-property-row:first-child > .cinder-table__cell {
|
|
174
174
|
border-top: 0;
|
|
175
175
|
}
|
|
176
176
|
|
|
@@ -178,25 +178,64 @@
|
|
|
178
178
|
display: contents;
|
|
179
179
|
}
|
|
180
180
|
|
|
181
|
-
.cinder-jse-
|
|
182
|
-
|
|
181
|
+
.cinder-jse-enum-editor {
|
|
182
|
+
display: grid;
|
|
183
|
+
gap: var(--cinder-space-3);
|
|
184
|
+
margin-block-start: var(--cinder-space-3);
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
.cinder-jse-enum-editor__table {
|
|
188
|
+
border-collapse: collapse;
|
|
189
|
+
inline-size: 100%;
|
|
183
190
|
}
|
|
184
191
|
|
|
185
|
-
.cinder-jse-
|
|
192
|
+
.cinder-jse-enum-editor__table th,
|
|
193
|
+
.cinder-jse-enum-editor__table td {
|
|
194
|
+
border-block-end: 1px solid var(--cinder-border-muted);
|
|
195
|
+
padding: var(--cinder-space-2);
|
|
196
|
+
text-align: start;
|
|
197
|
+
vertical-align: top;
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
.cinder-jse-enum-editor__actions {
|
|
186
201
|
display: flex;
|
|
187
|
-
|
|
188
|
-
gap: var(--cinder-space-
|
|
189
|
-
|
|
190
|
-
|
|
202
|
+
flex-wrap: wrap;
|
|
203
|
+
gap: var(--cinder-space-1);
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
.cinder-jse-enum-editor__error {
|
|
207
|
+
color: var(--cinder-color-danger-fg);
|
|
208
|
+
margin-block: var(--cinder-space-1) 0;
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
.cinder-jse-property-row[data-cinder-invalid] > .cinder-table__cell:first-child {
|
|
212
|
+
border-inline-start: 2px solid var(--cinder-color-danger-border);
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
.cinder-jse-property-row__key {
|
|
191
216
|
padding-inline-start: calc(
|
|
192
217
|
var(--cinder-space-3) + var(--cinder-jse-property-depth, 0) * var(--cinder-space-4)
|
|
193
218
|
);
|
|
194
|
-
|
|
219
|
+
white-space: nowrap;
|
|
220
|
+
}
|
|
221
|
+
|
|
222
|
+
.cinder-jse-property-row__type,
|
|
223
|
+
.cinder-jse-property-row__description {
|
|
224
|
+
font-size: var(--cinder-text-xs);
|
|
225
|
+
color: var(--cinder-text-subtle);
|
|
195
226
|
}
|
|
196
227
|
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
228
|
+
.cinder-jse-property-row__actions {
|
|
229
|
+
display: flex;
|
|
230
|
+
flex-wrap: wrap;
|
|
231
|
+
align-items: center;
|
|
232
|
+
gap: var(--cinder-space-1);
|
|
233
|
+
text-align: end;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/* The chevron + name form a single clickable disclosure trigger. Action
|
|
237
|
+
buttons live in their own cell so they keep the single-baseline layout
|
|
238
|
+
without nesting interactive elements inside the trigger. */
|
|
200
239
|
.cinder-jse-property-row__trigger {
|
|
201
240
|
display: inline-flex;
|
|
202
241
|
align-items: center;
|
|
@@ -242,33 +281,27 @@
|
|
|
242
281
|
color: var(--cinder-text);
|
|
243
282
|
}
|
|
244
283
|
|
|
245
|
-
.cinder-jse-property-
|
|
246
|
-
|
|
247
|
-
color: var(--cinder-text-subtle);
|
|
248
|
-
padding: 0 var(--cinder-space-1-5);
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
.cinder-jse-property-row__spacer {
|
|
252
|
-
flex: 1 1 auto;
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
.cinder-jse-property-row__panel {
|
|
256
|
-
display: flex;
|
|
257
|
-
flex-direction: column;
|
|
258
|
-
gap: var(--cinder-space-3);
|
|
284
|
+
.cinder-jse-property-row__detail-cell {
|
|
285
|
+
display: table-cell;
|
|
259
286
|
padding: var(--cinder-space-3) var(--cinder-space-3) var(--cinder-space-4);
|
|
260
|
-
|
|
287
|
+
padding-inline-start: calc(
|
|
288
|
+
var(--cinder-space-3) + var(--cinder-jse-property-depth, 0) * var(--cinder-space-4)
|
|
289
|
+
);
|
|
261
290
|
background: transparent;
|
|
262
291
|
}
|
|
263
292
|
|
|
293
|
+
.cinder-jse-property-row__detail-cell > * + * {
|
|
294
|
+
margin-block-start: var(--cinder-space-3);
|
|
295
|
+
}
|
|
296
|
+
|
|
264
297
|
/* The nested PropertyEditor inside an open property panel doesn't get a card. */
|
|
265
|
-
.cinder-jse-property-
|
|
298
|
+
.cinder-jse-property-row__detail-cell > .cinder-jse-property-editor[data-cinder-jse-depth] {
|
|
266
299
|
border: 0;
|
|
267
300
|
background: transparent;
|
|
268
301
|
border-radius: 0;
|
|
269
302
|
}
|
|
270
303
|
|
|
271
|
-
.cinder-jse-property-
|
|
304
|
+
.cinder-jse-property-row__detail-cell > .cinder-jse-property-editor > .cinder-jse-section {
|
|
272
305
|
padding-inline: 0;
|
|
273
306
|
}
|
|
274
307
|
|
|
@@ -14,7 +14,11 @@ import { tryParseJson, validateMetaSchema } from './json-schema-validator.ts';
|
|
|
14
14
|
// would compile as a legacy store auto-subscription to that variable
|
|
15
15
|
// instead of the rune call. json-schema-toolbar.svelte uses the same
|
|
16
16
|
// alias for the same reason.
|
|
17
|
-
let { state: editorState, idPrefix, class: className } = $props();
|
|
17
|
+
let { state: editorState, idPrefix, onApply, class: className } = $props();
|
|
18
|
+
async function applyDraft() {
|
|
19
|
+
if (await editorState.applyJsonDraft())
|
|
20
|
+
onApply?.();
|
|
21
|
+
}
|
|
18
22
|
// Parse is synchronous; the meta-schema check is not (validateMetaSchema
|
|
19
23
|
// dynamically imports Ajv), so it's tracked as state updated from an
|
|
20
24
|
// effect rather than a $derived. The state container only debounces
|
|
@@ -65,12 +69,7 @@ const canDiscard = $derived(editorState.jsonDraftIsDirty && !editorState.readonl
|
|
|
65
69
|
{#if editorState.jsonDraftIsDirty}
|
|
66
70
|
<Badge variant="warning">Draft modified — Apply to commit</Badge>
|
|
67
71
|
{/if}
|
|
68
|
-
<Button
|
|
69
|
-
variant="primary"
|
|
70
|
-
size="sm"
|
|
71
|
-
disabled={!canApply}
|
|
72
|
-
onclick={() => void editorState.applyJsonDraft()}
|
|
73
|
-
>
|
|
72
|
+
<Button variant="primary" size="sm" disabled={!canApply} onclick={() => void applyDraft()}>
|
|
74
73
|
Apply
|
|
75
74
|
</Button>
|
|
76
75
|
<Button
|
|
@@ -14,12 +14,15 @@ import Button from '../button/button.svelte';
|
|
|
14
14
|
import Checkbox from '../checkbox/checkbox.svelte';
|
|
15
15
|
import Collapsible from '@lostgradient/cinder/collapsible';
|
|
16
16
|
import Input from '../input/input.svelte';
|
|
17
|
+
import Select from '@lostgradient/cinder/select';
|
|
17
18
|
import { reconcileCompositionBranchKeys } from './composition-branch-keys.ts';
|
|
19
|
+
import { buildEnumPatch, detectEnumSource, isEnumLikeOneOf, readEnumDescriptions, readEnumValues, } from './enum-composition.ts';
|
|
18
20
|
import { DEFAULT_COLLAPSE_DEPTH, EDITABLE_KEYWORDS, MAX_RENDER_DEPTH, PRIMITIVE_TYPES, } from './property-editor.constants.ts';
|
|
19
21
|
import PropertyEditor from './property-editor.svelte';
|
|
20
22
|
import PropertyEditorConstraints from './property-editor-constraints.svelte';
|
|
23
|
+
import EnumEditor from './enum-editor.svelte';
|
|
21
24
|
import PropertyList from './property-list.svelte';
|
|
22
|
-
let { idPrefix, value, path, depth = 0, readonly = false, onvalidationErrorcount, onValueChange, class: className, } = $props();
|
|
25
|
+
let { idPrefix, value, path, depth = 0, propertyKey, readonly = false, enumDrafts = {}, historyRevision = 0, onvalidationErrorcount, onEnumDraftsChange, onValueChange, class: className, } = $props();
|
|
23
26
|
// ===== Boolean schema short-circuit =====
|
|
24
27
|
const isBooleanSchema = $derived(typeof value === 'boolean');
|
|
25
28
|
// ===== Object-shape derivations =====
|
|
@@ -41,9 +44,14 @@ const selectedTypes = $derived.by(() => {
|
|
|
41
44
|
return Array.isArray(t) ? [...t] : [t];
|
|
42
45
|
});
|
|
43
46
|
const isAnyType = $derived(selectedTypes.length === 0);
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
+
// A described enum value is promoted to a `oneOf` of `{const, description?}`
|
|
48
|
+
// branches (see enum-composition.ts) since bare `enum` has no description
|
|
49
|
+
// slot. `enumSource` is which representation (if either) is currently active.
|
|
50
|
+
const enumSource = $derived(detectEnumSource(objectValue));
|
|
51
|
+
const hasEnum = $derived(enumSource !== null);
|
|
52
|
+
const enumValues = $derived(readEnumValues(objectValue, enumSource));
|
|
53
|
+
const enumDescriptions = $derived(readEnumDescriptions(objectValue, enumSource));
|
|
54
|
+
const preservedKeys = $derived.by(() => Object.keys(objectValue).filter((key) => !EDITABLE_KEYWORDS.has(key) || (key === 'enum' && !Array.isArray(objectValue.enum))));
|
|
47
55
|
// ===== Mutation helpers =====
|
|
48
56
|
function patch(edits, opts = undefined) {
|
|
49
57
|
if (readonly)
|
|
@@ -125,7 +133,10 @@ function summaryLine() {
|
|
|
125
133
|
}
|
|
126
134
|
// ===== Children (object/array) =====
|
|
127
135
|
let childValidationCounts = $state({});
|
|
128
|
-
const
|
|
136
|
+
const retainedDraftCount = $derived(Object.entries(enumDrafts)
|
|
137
|
+
.filter(([draftPath]) => draftPath === `${path}/enum` || draftPath.startsWith(`${path}/`))
|
|
138
|
+
.reduce((count, [, drafts]) => count + Object.keys(drafts).length, 0));
|
|
139
|
+
const validationErrorCount = $derived(Math.max(Object.values(childValidationCounts).reduce((total, count) => total + count, 0), retainedDraftCount));
|
|
129
140
|
$effect(() => {
|
|
130
141
|
onvalidationErrorcount?.(validationErrorCount);
|
|
131
142
|
});
|
|
@@ -150,6 +161,98 @@ function patchProperties(properties, required) {
|
|
|
150
161
|
function setItems(items) {
|
|
151
162
|
patch({ items }, { label: 'edit items' });
|
|
152
163
|
}
|
|
164
|
+
function setEnum(enabled) {
|
|
165
|
+
if (!enabled) {
|
|
166
|
+
const { [`${path}/enum`]: _removedDraft, ...remainingDrafts } = enumDrafts;
|
|
167
|
+
onEnumDraftsChange?.(remainingDrafts);
|
|
168
|
+
// Only clear `oneOf` when it's the enum's own promoted representation
|
|
169
|
+
// that is CURRENTLY active — not merely "some oneOf that happens to be
|
|
170
|
+
// enum-shaped." `detectEnumSource` prefers `enum` when both are
|
|
171
|
+
// present, so an enum-shaped `oneOf` sitting unused alongside an
|
|
172
|
+
// active bare `enum` must not be silently deleted.
|
|
173
|
+
patch({
|
|
174
|
+
enum: undefined,
|
|
175
|
+
oneOf: enumSource === 'oneOf' ? undefined : objectValue.oneOf,
|
|
176
|
+
}, { label: 'edit enum' });
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
179
|
+
if (enumSource !== null)
|
|
180
|
+
return; // already enabled, in either representation
|
|
181
|
+
patch({ enum: [''] }, { label: 'edit enum' });
|
|
182
|
+
}
|
|
183
|
+
function setEnumEntries(values, descriptions, options = undefined) {
|
|
184
|
+
const patchValues = buildEnumPatch(values, descriptions);
|
|
185
|
+
// The enum table can be visible via a bare `enum` even when `oneOf` holds
|
|
186
|
+
// an unrelated real composition on the same node (detectEnumSource
|
|
187
|
+
// prefers `enum`; see setEnum's mirror-image guard above). Promoting to a
|
|
188
|
+
// described enum writes `oneOf`, which would otherwise silently destroy
|
|
189
|
+
// that real composition. When that's the case, commit the values without
|
|
190
|
+
// promoting — the description can't be represented without overwriting
|
|
191
|
+
// data the user didn't ask to change.
|
|
192
|
+
if (patchValues.oneOf !== undefined &&
|
|
193
|
+
objectValue.oneOf !== undefined &&
|
|
194
|
+
!isEnumLikeOneOf(objectValue.oneOf)) {
|
|
195
|
+
patch({ enum: values }, options ?? { label: 'edit enum values' });
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
patch(patchValues, options ?? { label: 'edit enum values' });
|
|
199
|
+
}
|
|
200
|
+
// ===== Type select =====
|
|
201
|
+
// A fast-path selector covering the seven options CIN-156 names plus "Any"
|
|
202
|
+
// and an explicit "Multiple types" escape hatch. `type` may legitimately be
|
|
203
|
+
// an array (JSON Schema multi-type) or `null`, neither of which fits a
|
|
204
|
+
// single-select value — those states, and the deliberate opt-in to edit
|
|
205
|
+
// them, fall back to the existing PRIMITIVE_TYPES checkbox row below.
|
|
206
|
+
const typeSelectValue = $derived.by(() => {
|
|
207
|
+
if (hasEnum)
|
|
208
|
+
return 'enum';
|
|
209
|
+
if (selectedTypes.length > 1 || selectedTypes.includes('null'))
|
|
210
|
+
return 'multiple';
|
|
211
|
+
return isAnyType ? 'any' : selectedTypes[0];
|
|
212
|
+
});
|
|
213
|
+
const showTypeCheckboxes = $derived(typeSelectValue === 'multiple');
|
|
214
|
+
const typeSelectOptions = [
|
|
215
|
+
{ value: 'any', label: 'Any' },
|
|
216
|
+
{ value: 'string', label: 'string' },
|
|
217
|
+
{ value: 'number', label: 'number' },
|
|
218
|
+
{ value: 'integer', label: 'integer' },
|
|
219
|
+
{ value: 'boolean', label: 'boolean' },
|
|
220
|
+
{ value: 'enum', label: 'enum' },
|
|
221
|
+
{ value: 'object', label: 'object' },
|
|
222
|
+
{ value: 'array', label: 'array' },
|
|
223
|
+
{ value: 'multiple', label: 'Multiple types' },
|
|
224
|
+
];
|
|
225
|
+
function setTypeFromSelect(next) {
|
|
226
|
+
if (readonly || next === typeSelectValue)
|
|
227
|
+
return;
|
|
228
|
+
if (next === 'multiple') {
|
|
229
|
+
if (hasEnum)
|
|
230
|
+
setEnum(false);
|
|
231
|
+
// `type` is already multi-type or `null` (it just wasn't visible behind
|
|
232
|
+
// an active `enum`) — reveal the checkbox row on the existing value
|
|
233
|
+
// rather than reseeding it and silently dropping types the schema
|
|
234
|
+
// already had.
|
|
235
|
+
if (selectedTypes.length > 1 || selectedTypes.includes('null'))
|
|
236
|
+
return;
|
|
237
|
+
// Otherwise seed a sensible starting multi-type set from the current
|
|
238
|
+
// single type (or 'string' from 'any') so the checkbox row opens with
|
|
239
|
+
// something already checked rather than empty.
|
|
240
|
+
const base = selectedTypes[0] ?? 'string';
|
|
241
|
+
setTypeFromCheckboxes([base, 'null']);
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
if (next === 'enum') {
|
|
245
|
+
setEnum(true);
|
|
246
|
+
return;
|
|
247
|
+
}
|
|
248
|
+
if (hasEnum)
|
|
249
|
+
setEnum(false);
|
|
250
|
+
if (next === 'any') {
|
|
251
|
+
setTypeFromCheckboxes([]);
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
setTypeFromCheckboxes([next]);
|
|
255
|
+
}
|
|
153
256
|
// ===== Composition =====
|
|
154
257
|
function patchComposition(keyword, next) {
|
|
155
258
|
patch({ [keyword]: next }, {
|
|
@@ -205,6 +308,20 @@ function removeCompositionBranch(keyword, branchIndex) {
|
|
|
205
308
|
const nextBranchKeys = [...compositionBranchKeys[keyword]];
|
|
206
309
|
list.splice(branchIndex, 1);
|
|
207
310
|
nextBranchKeys.splice(branchIndex, 1);
|
|
311
|
+
const branchPrefix = `${path}/${keyword}/`;
|
|
312
|
+
onEnumDraftsChange?.(Object.fromEntries(Object.entries(enumDrafts).flatMap(([draftPath, draft]) => {
|
|
313
|
+
if (!draftPath.startsWith(branchPrefix))
|
|
314
|
+
return [[draftPath, draft]];
|
|
315
|
+
const remainder = draftPath.slice(branchPrefix.length);
|
|
316
|
+
const match = /^(\d+)(\/.*)?$/.exec(remainder);
|
|
317
|
+
if (!match)
|
|
318
|
+
return [[draftPath, draft]];
|
|
319
|
+
const index = Number(match[1]);
|
|
320
|
+
if (index === branchIndex)
|
|
321
|
+
return [];
|
|
322
|
+
const nextIndex = index > branchIndex ? index - 1 : index;
|
|
323
|
+
return [[`${branchPrefix}${nextIndex}${match[2] ?? ''}`, draft]];
|
|
324
|
+
})));
|
|
208
325
|
setKeywordKeys(keyword, nextBranchKeys);
|
|
209
326
|
if (removedBranchKey)
|
|
210
327
|
setChildValidationErrorCount(`${keyword}:${removedBranchKey}`, 0);
|
|
@@ -271,27 +388,55 @@ function addCompositionBranch(keyword) {
|
|
|
271
388
|
<!-- Type section -->
|
|
272
389
|
<div class="cinder-jse-section">
|
|
273
390
|
<h4 class="cinder-jse-section__title">Type</h4>
|
|
274
|
-
<
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
391
|
+
<Select
|
|
392
|
+
id={`${idPrefix}-type-select`}
|
|
393
|
+
label={`${propertyKey ?? 'Value'} type`}
|
|
394
|
+
labelVisible={false}
|
|
395
|
+
value={typeSelectValue}
|
|
396
|
+
options={typeSelectOptions}
|
|
397
|
+
disabled={readonly}
|
|
398
|
+
onchange={(event: Event) => setTypeFromSelect((event.target as HTMLSelectElement).value)}
|
|
399
|
+
/>
|
|
400
|
+
{#if showTypeCheckboxes}
|
|
401
|
+
<div class="cinder-jse-type-row">
|
|
283
402
|
<Checkbox
|
|
284
|
-
id={`${idPrefix}-type
|
|
285
|
-
checked={
|
|
286
|
-
label=
|
|
403
|
+
id={`${idPrefix}-type-any`}
|
|
404
|
+
checked={isAnyType}
|
|
405
|
+
label="Any"
|
|
287
406
|
disabled={readonly}
|
|
288
|
-
onchange={(event: Event) =>
|
|
289
|
-
toggleType(primitive, (event.target as HTMLInputElement).checked)}
|
|
407
|
+
onchange={(event: Event) => setAny((event.target as HTMLInputElement).checked)}
|
|
290
408
|
/>
|
|
291
|
-
|
|
292
|
-
|
|
409
|
+
{#each PRIMITIVE_TYPES as primitive (primitive)}
|
|
410
|
+
<Checkbox
|
|
411
|
+
id={`${idPrefix}-type-${primitive}`}
|
|
412
|
+
checked={selectedTypes.includes(primitive)}
|
|
413
|
+
label={primitive}
|
|
414
|
+
disabled={readonly}
|
|
415
|
+
onchange={(event: Event) =>
|
|
416
|
+
toggleType(primitive, (event.target as HTMLInputElement).checked)}
|
|
417
|
+
/>
|
|
418
|
+
{/each}
|
|
419
|
+
</div>
|
|
420
|
+
{/if}
|
|
293
421
|
</div>
|
|
294
422
|
|
|
423
|
+
{#if hasEnum}
|
|
424
|
+
<div class="cinder-jse-section">
|
|
425
|
+
<EnumEditor
|
|
426
|
+
idPrefix={`${idPrefix}-enum`}
|
|
427
|
+
path={`${path}/enum`}
|
|
428
|
+
values={enumValues}
|
|
429
|
+
descriptions={enumDescriptions}
|
|
430
|
+
drafts={enumDrafts[`${path}/enum`] ?? {}}
|
|
431
|
+
{historyRevision}
|
|
432
|
+
{readonly}
|
|
433
|
+
onvalidationErrorcount={(count) => setChildValidationErrorCount('enum', count)}
|
|
434
|
+
onDraftsChange={(next) => onEnumDraftsChange?.({ ...enumDrafts, [`${path}/enum`]: next })}
|
|
435
|
+
onValuesChange={setEnumEntries}
|
|
436
|
+
/>
|
|
437
|
+
</div>
|
|
438
|
+
{/if}
|
|
439
|
+
|
|
295
440
|
<!-- Object constraints (properties + required) — comes early because it's the heaviest. -->
|
|
296
441
|
{#if showObjectConstraints}
|
|
297
442
|
<div class="cinder-jse-section">
|
|
@@ -300,10 +445,14 @@ function addCompositionBranch(keyword) {
|
|
|
300
445
|
{idPrefix}
|
|
301
446
|
{readonly}
|
|
302
447
|
{depth}
|
|
448
|
+
{enumDrafts}
|
|
449
|
+
{historyRevision}
|
|
450
|
+
parentKey={propertyKey}
|
|
303
451
|
path={`${path}/properties`}
|
|
304
452
|
properties={objectValue.properties ?? {}}
|
|
305
453
|
required={objectValue.required ?? []}
|
|
306
454
|
onvalidationErrorcount={(count) => setChildValidationErrorCount('properties', count)}
|
|
455
|
+
{onEnumDraftsChange}
|
|
307
456
|
onValueChange={patchProperties}
|
|
308
457
|
/>
|
|
309
458
|
</div>
|
|
@@ -317,9 +466,13 @@ function addCompositionBranch(keyword) {
|
|
|
317
466
|
idPrefix={`${idPrefix}-items`}
|
|
318
467
|
path={`${path}/items`}
|
|
319
468
|
depth={depth + 1}
|
|
469
|
+
propertyKey="items"
|
|
320
470
|
{readonly}
|
|
471
|
+
{enumDrafts}
|
|
472
|
+
{historyRevision}
|
|
321
473
|
value={objectValue.items ?? {}}
|
|
322
474
|
onvalidationErrorcount={(count) => setChildValidationErrorCount('items', count)}
|
|
475
|
+
{onEnumDraftsChange}
|
|
323
476
|
onValueChange={(next) => setItems(next)}
|
|
324
477
|
/>
|
|
325
478
|
</div>
|
|
@@ -335,9 +488,12 @@ function addCompositionBranch(keyword) {
|
|
|
335
488
|
onPatch={patch}
|
|
336
489
|
/>
|
|
337
490
|
|
|
338
|
-
<!-- Composition (only when present)
|
|
491
|
+
<!-- Composition (only when present). A oneOf standing in for a described
|
|
492
|
+
enum (enumSource === 'oneOf') is rendered by the enum table above
|
|
493
|
+
instead — showing it here too would double-render every value as
|
|
494
|
+
both an enum row and a full recursive branch editor. -->
|
|
339
495
|
{#each ['allOf', 'anyOf', 'oneOf'] as const as keyword (keyword)}
|
|
340
|
-
{#if Array.isArray(objectValue[keyword])}
|
|
496
|
+
{#if Array.isArray(objectValue[keyword]) && !(keyword === 'oneOf' && enumSource === 'oneOf')}
|
|
341
497
|
<Collapsible
|
|
342
498
|
class="cinder-jse-section cinder-jse-section--collapsible"
|
|
343
499
|
trigger={keyword}
|
|
@@ -351,9 +507,12 @@ function addCompositionBranch(keyword) {
|
|
|
351
507
|
path={`${path}/${keyword}/${branchIndex}`}
|
|
352
508
|
depth={depth + 1}
|
|
353
509
|
{readonly}
|
|
510
|
+
{enumDrafts}
|
|
511
|
+
{historyRevision}
|
|
354
512
|
value={branch}
|
|
355
513
|
onvalidationErrorcount={(count) =>
|
|
356
514
|
setChildValidationErrorCount(`${keyword}:${branchKey}`, count)}
|
|
515
|
+
{onEnumDraftsChange}
|
|
357
516
|
onValueChange={(next) => {
|
|
358
517
|
const list = [...objectValue[keyword]!];
|
|
359
518
|
list[branchIndex] = next;
|