@widgetic/editor 4.1.22 → 4.1.23
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 +43 -0
- package/dist/components/editors/CompositionEditorApp.svelte +228 -206
- package/dist/components/editors/EmbedAssistantPanel.svelte +270 -48
- package/dist/components/ic/AngleInputController.svelte +18 -3
- package/dist/components/ic/NumberInputController.svelte +16 -2
- package/dist/composition/compositionApi.d.ts +25 -0
- package/dist/composition/compositionApi.js +34 -4
- package/dist/composition/compositionEditorController.d.ts +63 -3
- package/dist/composition/compositionEditorController.js +207 -10
- package/dist/composition/staleGuard.d.ts +111 -0
- package/dist/composition/staleGuard.js +279 -0
- package/dist/embedAssistant/embedAssistantSuggest.d.ts +20 -0
- package/dist/embedAssistant/embedAssistantSuggest.js +29 -0
- package/dist/embedAssistant/embedAssistantTurns.d.ts +73 -0
- package/dist/embedAssistant/embedAssistantTurns.js +56 -0
- package/dist/embedAssistant/types.d.ts +15 -0
- package/dist/i18n/language.d.ts +15 -0
- package/dist/i18n/messages.d.ts +9 -0
- package/dist/i18n/messages.js +11 -0
- package/dist/i18n/translate.d.ts +1 -1
- package/package.json +6 -1
- package/dist/components/ic/NumberControls.svelte +0 -505
- package/dist/components/ic/NumberControls.svelte.d.ts +0 -37
- package/dist/components/ic/numberControlsSteps.d.ts +0 -17
- package/dist/components/ic/numberControlsSteps.js +0 -23
- package/dist/components/ic/numberControlsValueArea.d.ts +0 -29
- package/dist/components/ic/numberControlsValueArea.js +0 -51
|
@@ -6,8 +6,25 @@
|
|
|
6
6
|
<script lang="ts">
|
|
7
7
|
import { createEventDispatcher, onDestroy, onMount } from 'svelte';
|
|
8
8
|
import { Button } from '@widgetic/design-system/components';
|
|
9
|
+
// The grey words after what the person has typed, which Tab takes: the engine is the design system's, one box's part is below
|
|
10
|
+
import {
|
|
11
|
+
completionHintMemory,
|
|
12
|
+
createGatewayCompletion,
|
|
13
|
+
inlineCompletion,
|
|
14
|
+
type GatewayCompletion,
|
|
15
|
+
type GhostView,
|
|
16
|
+
} from '@widgetic/design-system/inline-completion';
|
|
17
|
+
// The assistant's face: the chat's turn (the avatar with its content beside it) and its rules for the avatar's look, with the
|
|
18
|
+
// brand's mascot as the drawing. The chat itself is not used: this panel keeps its own transcript, question and composer.
|
|
19
|
+
import { AgentTurn, liveAgentLook, settledAgentLook } from '@widgetic/chat';
|
|
20
|
+
import type { AgentAvatarRenderProps, AgentLook } from '@widgetic/chat';
|
|
21
|
+
import { Mascot, warmUpMascot } from '@widgetic/brand/mascot';
|
|
9
22
|
import { useEditorLanguage } from '../../i18n/language.js';
|
|
10
23
|
import type { EmbedAssistantWireConfig } from '../../embedAssistant/types.js';
|
|
24
|
+
import {
|
|
25
|
+
EMBED_ASSISTANT_SUGGEST_SURFACE,
|
|
26
|
+
embedSuggestContext,
|
|
27
|
+
} from '../../embedAssistant/embedAssistantSuggest.js';
|
|
11
28
|
import {
|
|
12
29
|
buildAssistantHistory,
|
|
13
30
|
emptyEmbedAssistantUiState,
|
|
@@ -18,6 +35,12 @@
|
|
|
18
35
|
EMBED_ASSISTANT_STREAM_MESSAGES,
|
|
19
36
|
parseEmbedAssistantSseStream,
|
|
20
37
|
} from '../../embedAssistant/embedAssistantStream.js';
|
|
38
|
+
import {
|
|
39
|
+
embedAssistantMoment,
|
|
40
|
+
embedMomentKeepsAvatarSmall,
|
|
41
|
+
groupEmbedAssistantTurns,
|
|
42
|
+
type EmbedAssistantMoment,
|
|
43
|
+
} from '../../embedAssistant/embedAssistantTurns.js';
|
|
21
44
|
|
|
22
45
|
const SESSION_OPEN_KEY = 'embed_assistant_panel_open';
|
|
23
46
|
const SESSION_WIDTH_KEY = 'embed_assistant_panel_width';
|
|
@@ -32,7 +55,7 @@
|
|
|
32
55
|
copyEmbedCode: void;
|
|
33
56
|
}>();
|
|
34
57
|
|
|
35
|
-
const { t } = useEditorLanguage();
|
|
58
|
+
const { t, locale } = useEditorLanguage();
|
|
36
59
|
|
|
37
60
|
let collapsed = true;
|
|
38
61
|
let draft = '';
|
|
@@ -43,12 +66,87 @@
|
|
|
43
66
|
let isResizing = false;
|
|
44
67
|
let streamAbort: AbortController | null = null;
|
|
45
68
|
|
|
69
|
+
// "Desired Suggestions": the grey words after what the person has typed (Tab takes them, typing on or Esc sends them away). The
|
|
70
|
+
// host gives a suggest route or it does not: without one the box has no suggestions and the panel is what it always was.
|
|
71
|
+
let completion: GatewayCompletion | null = null;
|
|
72
|
+
// A suggestion is on the screen now: the hint beside the box says what Tab does with it
|
|
73
|
+
let suggestionShows = false;
|
|
74
|
+
// The line of the hint stays once it has been needed, so the panel does not move each time a suggestion comes and goes
|
|
75
|
+
let isHintLineKept = false;
|
|
76
|
+
// The routes are read as plain text, so a host that hands in a new config object with the same routes does not start the box over
|
|
77
|
+
$: suggestUrl = assistant.suggestUrl || undefined;
|
|
78
|
+
$: outcomeUrl = assistant.outcomeUrl || undefined;
|
|
79
|
+
$: completion = buildCompletion(suggestUrl, outcomeUrl);
|
|
80
|
+
|
|
46
81
|
const welcomeChips = [
|
|
47
82
|
{ labelKey: 'editor.embedAssistant.chipOverlayExitIntent', messageKey: 'editor.embedAssistant.chipOverlayExitIntent' },
|
|
48
83
|
{ labelKey: 'editor.embedAssistant.chipCenteredFiveTimes', messageKey: 'editor.embedAssistant.chipCenteredFiveTimes' },
|
|
49
84
|
{ labelKey: 'editor.embedAssistant.chipHideOnMobile', messageKey: 'editor.embedAssistant.chipHideOnMobile' },
|
|
50
85
|
] as const;
|
|
51
86
|
|
|
87
|
+
/** How long the mascot's WebGL context is kept ready for the next one, in milliseconds: two minutes, as the creator keeps it. */
|
|
88
|
+
const MASCOT_KEEP_WARM_MILLISECONDS = 120_000;
|
|
89
|
+
/** A turn that is not the newest: a small still picture, so a long conversation keeps one mascot moving and not one per turn. */
|
|
90
|
+
const stillAvatarLook: AgentLook = { state: 'idle', size: 'small', live: false };
|
|
91
|
+
|
|
92
|
+
// "Desired Run Facts": the settings the LATEST run (a message sent) changed. The stream tells the host about them and does not
|
|
93
|
+
// keep them in the screen's state, so the panel notes it, and forgets it when the person speaks again or starts a new chat.
|
|
94
|
+
let hasRunSetOptions = false;
|
|
95
|
+
// True once the panel is on screen: the moment of the assistant is told in the console from then on, never while rendering
|
|
96
|
+
let isMounted = false;
|
|
97
|
+
let lastReportedMoment = '';
|
|
98
|
+
|
|
99
|
+
// "Desired Mascot": the assistant is drawn as the Scribble Mascot unless the host says false (a partner can turn it off)
|
|
100
|
+
$: isMascotEnabled = assistant.agentMascot !== false;
|
|
101
|
+
// "Desired Assistant Moment": what the assistant is doing right now, as far as its avatar cares. A question waiting is the
|
|
102
|
+
// card that is on screen (the stream clears it when the run is done), a failure is the line that is on screen.
|
|
103
|
+
$: currentAssistantMoment = embedAssistantMoment({
|
|
104
|
+
isStreaming: ui.isStreaming,
|
|
105
|
+
hasReplyStarted: ui.messages[ui.messages.length - 1]?.role === 'assistant',
|
|
106
|
+
hasCardToAnswer: ui.pendingQuestion !== null,
|
|
107
|
+
hasFailed: ui.lastError !== null,
|
|
108
|
+
hasSucceeded: hasRunSetOptions,
|
|
109
|
+
});
|
|
110
|
+
// The newest turn's avatar follows the chat's own rules for the moment (the panel is narrow, so a question waiting keeps the
|
|
111
|
+
// small avatar: see `embedMomentKeepsAvatarSmall`); the turns before it rest
|
|
112
|
+
$: newestAvatarLook = lookOfNewestAvatar(currentAssistantMoment);
|
|
113
|
+
// Something of the assistant's is on screen after the transcript, so the last turn is its own even when the person spoke last
|
|
114
|
+
$: hasLiveContent = ui.isStreaming || ui.pendingQuestion !== null || ui.lastError !== null;
|
|
115
|
+
// "Desired Turns": the transcript as rows, the assistant's messages in a row being one turn with one face
|
|
116
|
+
$: transcriptTurns = groupEmbedAssistantTurns(ui.messages, hasLiveContent);
|
|
117
|
+
$: if (isMounted) reportAssistantMoment(currentAssistantMoment);
|
|
118
|
+
|
|
119
|
+
function lookOfNewestAvatar(moment: EmbedAssistantMoment): AgentLook {
|
|
120
|
+
const chatLook =
|
|
121
|
+
moment.kind === 'live' ? liveAgentLook(moment.phase) : settledAgentLook(moment.outcome, true);
|
|
122
|
+
return embedMomentKeepsAvatarSmall(moment) ? { ...chatLook, size: 'small' } : chatLook;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
// Said once for each change of what the assistant is doing, never on every redraw
|
|
126
|
+
function reportAssistantMoment(moment: EmbedAssistantMoment): void {
|
|
127
|
+
const momentSignature = [moment.kind, moment.kind === 'live' ? moment.phase : moment.outcome].join(
|
|
128
|
+
'/',
|
|
129
|
+
);
|
|
130
|
+
if (momentSignature === lastReportedMoment) return;
|
|
131
|
+
lastReportedMoment = momentSignature;
|
|
132
|
+
console.debug('[embed-assistant] the assistant is now', momentSignature);
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
// The first mascot of a page waits for Three.js, the WebGL context and the shader (a still picture until then). They are got
|
|
136
|
+
// ready once the panel is open, so the first thing the assistant does starts moving at once. With the mascot off, nothing is fetched.
|
|
137
|
+
function warmUpAssistantMascot(): void {
|
|
138
|
+
if (assistant.agentMascot === false) return;
|
|
139
|
+
try {
|
|
140
|
+
// The brand never throws and never rejects: a page without WebGL gets the poster, as every mascot does
|
|
141
|
+
void warmUpMascot({ keepWarmForMilliseconds: MASCOT_KEEP_WARM_MILLISECONDS });
|
|
142
|
+
} catch (error) {
|
|
143
|
+
console.debug(
|
|
144
|
+
'[embed-assistant] the mascot could not be warmed up; the first one starts as it always did',
|
|
145
|
+
error,
|
|
146
|
+
);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
52
150
|
onMount(() => {
|
|
53
151
|
try {
|
|
54
152
|
collapsed = sessionStorage.getItem(SESSION_OPEN_KEY) !== 'open';
|
|
@@ -62,6 +160,8 @@
|
|
|
62
160
|
if (assistant.initialTranscript?.length) {
|
|
63
161
|
ui = { ...ui, messages: [...assistant.initialTranscript] };
|
|
64
162
|
}
|
|
163
|
+
if (!collapsed) warmUpAssistantMascot();
|
|
164
|
+
isMounted = true;
|
|
65
165
|
});
|
|
66
166
|
|
|
67
167
|
function persistOpenState(): void {
|
|
@@ -77,11 +177,66 @@
|
|
|
77
177
|
assistant.onTranscriptChange?.(ui.messages);
|
|
78
178
|
}
|
|
79
179
|
|
|
80
|
-
|
|
180
|
+
// The headers of a call to the gateway, as the host gives them: at once, or when it has them (a token refreshed on demand)
|
|
181
|
+
function authHeaders(): Promise<Record<string, string>> | Record<string, string> {
|
|
81
182
|
const headers = assistant.getAuthHeaders;
|
|
82
183
|
return typeof headers === 'function' ? headers() : headers;
|
|
83
184
|
}
|
|
84
185
|
|
|
186
|
+
// What the engine says it did, quietly and once per kind of thing (a gateway that is down is one line, not one per keystroke)
|
|
187
|
+
function logCompletion(message: string, detail?: Record<string, unknown>): void {
|
|
188
|
+
console.debug('[embed-assistant] suggestions:', message, detail ?? '');
|
|
189
|
+
}
|
|
190
|
+
|
|
191
|
+
// The box of suggestions for the routes the host gave, or null without a suggest route. What the previous one counted goes out
|
|
192
|
+
// first (the host gave other routes), and it is let go of.
|
|
193
|
+
function buildCompletion(
|
|
194
|
+
suggestRoute: string | undefined,
|
|
195
|
+
outcomeRoute: string | undefined,
|
|
196
|
+
): GatewayCompletion | null {
|
|
197
|
+
completion?.destroy();
|
|
198
|
+
if (!suggestRoute) return null;
|
|
199
|
+
try {
|
|
200
|
+
return createGatewayCompletion({
|
|
201
|
+
surface: EMBED_ASSISTANT_SUGGEST_SURFACE,
|
|
202
|
+
suggestUrl: suggestRoute,
|
|
203
|
+
outcomeUrl: outcomeRoute,
|
|
204
|
+
headers: authHeaders,
|
|
205
|
+
// The calls carry the person's token and not a cookie, as the stream's do
|
|
206
|
+
credentials: 'omit',
|
|
207
|
+
locale: () => $locale,
|
|
208
|
+
// What the box says about itself: the settings that are set, so a setting that is set is not suggested again
|
|
209
|
+
context: () => embedSuggestContext(currentSettings),
|
|
210
|
+
log: logCompletion,
|
|
211
|
+
});
|
|
212
|
+
} catch (error) {
|
|
213
|
+
console.debug(
|
|
214
|
+
'[embed-assistant] the suggestions could not be set up; the box shows none',
|
|
215
|
+
error,
|
|
216
|
+
);
|
|
217
|
+
return null;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
// The suggestion on the screen comes and goes: the hint beside the box follows it. The hint is for the first suggestion only: the
|
|
222
|
+
// design system's action notes the first one taken (before it tells the box the grey words are gone), and from then on the box has no
|
|
223
|
+
// hint and no line for one, so the panel is as it is without suggestions.
|
|
224
|
+
function handleSuggestionChange(suggestion: GhostView | null): void {
|
|
225
|
+
suggestionShows = suggestion !== null;
|
|
226
|
+
if (completionHintMemory.learned) {
|
|
227
|
+
isHintLineKept = false;
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
if (suggestionShows) isHintLineKept = true;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
// What a screen reader hears when a suggestion shows: the words typed with the suggestion in them
|
|
234
|
+
function describeSuggestion(suggestionText: string): string {
|
|
235
|
+
return $t('editor.embedAssistant.suggestionAnnouncement', {
|
|
236
|
+
text: `${draft}${suggestionText}`.trim(),
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
|
|
85
240
|
async function sendMessage(
|
|
86
241
|
text: string,
|
|
87
242
|
answer?: { cardId: string; selectedOptionIds: string[] },
|
|
@@ -89,6 +244,7 @@
|
|
|
89
244
|
if (!text.trim() || ui.isStreaming) return;
|
|
90
245
|
streamAbort?.abort();
|
|
91
246
|
streamAbort = new AbortController();
|
|
247
|
+
hasRunSetOptions = false;
|
|
92
248
|
ui = reduceEmbedAssistantUiState(ui, { type: 'user_message', id: crypto.randomUUID(), text });
|
|
93
249
|
ui = reduceEmbedAssistantUiState(ui, { type: 'streaming', value: true });
|
|
94
250
|
notifyTranscript();
|
|
@@ -106,6 +262,7 @@
|
|
|
106
262
|
});
|
|
107
263
|
for await (const event of parseEmbedAssistantSseStream(response, streamAbort.signal)) {
|
|
108
264
|
if (event.type === 'options_set') {
|
|
265
|
+
hasRunSetOptions = true;
|
|
109
266
|
dispatch('optionsSet', {
|
|
110
267
|
options: event.payload.options,
|
|
111
268
|
changedIds: event.payload.changedIds,
|
|
@@ -139,10 +296,12 @@
|
|
|
139
296
|
function toggleCollapsed(): void {
|
|
140
297
|
collapsed = !collapsed;
|
|
141
298
|
persistOpenState();
|
|
299
|
+
if (!collapsed) warmUpAssistantMascot();
|
|
142
300
|
}
|
|
143
301
|
|
|
144
302
|
function newChat(): void {
|
|
145
303
|
streamAbort?.abort();
|
|
304
|
+
hasRunSetOptions = false;
|
|
146
305
|
ui = reduceEmbedAssistantUiState(ui, { type: 'reset' });
|
|
147
306
|
notifyTranscript();
|
|
148
307
|
}
|
|
@@ -180,11 +339,60 @@
|
|
|
180
339
|
onDestroy(() => {
|
|
181
340
|
streamAbort?.abort();
|
|
182
341
|
endResize();
|
|
342
|
+
// What the box counted of its suggestions goes out as it goes away
|
|
343
|
+
completion?.destroy();
|
|
183
344
|
});
|
|
184
345
|
</script>
|
|
185
346
|
|
|
186
347
|
<svelte:window on:pointermove={onResizeMove} on:pointerup={endResize} />
|
|
187
348
|
|
|
349
|
+
{#snippet assistantAvatar(avatar: AgentAvatarRenderProps)}
|
|
350
|
+
<!-- The assistant's face: the brand's mascot, drawn as the chat's avatar asks (its state, its size, a still picture for a turn that is not the newest). -->
|
|
351
|
+
<Mascot
|
|
352
|
+
state={avatar.state}
|
|
353
|
+
size={avatar.size}
|
|
354
|
+
label={avatar.label}
|
|
355
|
+
decorative={!avatar.label}
|
|
356
|
+
frozenAt={avatar.live ? undefined : 0.5}
|
|
357
|
+
settleTo="idle"
|
|
358
|
+
/>
|
|
359
|
+
{/snippet}
|
|
360
|
+
|
|
361
|
+
<!-- The question the assistant asked, which the newest turn shows until the person has answered. -->
|
|
362
|
+
{#snippet pendingQuestionCard()}
|
|
363
|
+
{#if ui.pendingQuestion}
|
|
364
|
+
<div class="border-border rounded-xl border bg-accent/30 p-3">
|
|
365
|
+
<p class="text-body text-foreground mb-2">{ui.pendingQuestion.question}</p>
|
|
366
|
+
<div class="flex flex-col gap-2">
|
|
367
|
+
{#each ui.pendingQuestion.options as option (option.id)}
|
|
368
|
+
<label class="flex cursor-pointer items-center gap-2">
|
|
369
|
+
<input
|
|
370
|
+
type={ui.pendingQuestion.allowMultiple ? 'checkbox' : 'radio'}
|
|
371
|
+
name="embed-assistant-question"
|
|
372
|
+
value={option.id}
|
|
373
|
+
checked={selectedOptionIds.includes(option.id)}
|
|
374
|
+
on:change={() => {
|
|
375
|
+
if (ui.pendingQuestion?.allowMultiple) {
|
|
376
|
+
selectedOptionIds = selectedOptionIds.includes(option.id)
|
|
377
|
+
? selectedOptionIds.filter((id) => id !== option.id)
|
|
378
|
+
: [...selectedOptionIds, option.id];
|
|
379
|
+
} else {
|
|
380
|
+
selectedOptionIds = [option.id];
|
|
381
|
+
}
|
|
382
|
+
}}
|
|
383
|
+
/>
|
|
384
|
+
<span class="text-body text-foreground">{option.label}</span>
|
|
385
|
+
</label>
|
|
386
|
+
{/each}
|
|
387
|
+
</div>
|
|
388
|
+
<!-- Secondary: the editor already has its main call to action, a chat card never adds a second one. -->
|
|
389
|
+
<Button class="mt-3" size="sm" variant="secondary" onclick={submitQuestionAnswer}>
|
|
390
|
+
{$t('editor.embedAssistant.continue')}
|
|
391
|
+
</Button>
|
|
392
|
+
</div>
|
|
393
|
+
{/if}
|
|
394
|
+
{/snippet}
|
|
395
|
+
|
|
188
396
|
{#if collapsed}
|
|
189
397
|
<button
|
|
190
398
|
type="button"
|
|
@@ -229,64 +437,63 @@
|
|
|
229
437
|
{/each}
|
|
230
438
|
</div>
|
|
231
439
|
{/if}
|
|
232
|
-
{#each
|
|
233
|
-
|
|
234
|
-
class="text-body
|
|
235
|
-
|
|
236
|
-
: 'text-muted-foreground'}"
|
|
237
|
-
>
|
|
238
|
-
{message.text}
|
|
239
|
-
</div>
|
|
240
|
-
{/each}
|
|
241
|
-
{#if ui.isStreaming}
|
|
242
|
-
<p class="text-caption text-muted-foreground" aria-live="polite">{$t('editor.embedAssistant.working')}</p>
|
|
243
|
-
{/if}
|
|
244
|
-
{#if ui.pendingQuestion}
|
|
245
|
-
<div class="border-border rounded-xl border bg-accent/30 p-3">
|
|
246
|
-
<p class="text-body text-foreground mb-2">{ui.pendingQuestion.question}</p>
|
|
247
|
-
<div class="flex flex-col gap-2">
|
|
248
|
-
{#each ui.pendingQuestion.options as option (option.id)}
|
|
249
|
-
<label class="flex cursor-pointer items-center gap-2">
|
|
250
|
-
<input
|
|
251
|
-
type={ui.pendingQuestion.allowMultiple ? 'checkbox' : 'radio'}
|
|
252
|
-
name="embed-assistant-question"
|
|
253
|
-
value={option.id}
|
|
254
|
-
checked={selectedOptionIds.includes(option.id)}
|
|
255
|
-
on:change={() => {
|
|
256
|
-
if (ui.pendingQuestion?.allowMultiple) {
|
|
257
|
-
selectedOptionIds = selectedOptionIds.includes(option.id)
|
|
258
|
-
? selectedOptionIds.filter((id) => id !== option.id)
|
|
259
|
-
: [...selectedOptionIds, option.id];
|
|
260
|
-
} else {
|
|
261
|
-
selectedOptionIds = [option.id];
|
|
262
|
-
}
|
|
263
|
-
}}
|
|
264
|
-
/>
|
|
265
|
-
<span class="text-body text-foreground">{option.label}</span>
|
|
266
|
-
</label>
|
|
267
|
-
{/each}
|
|
440
|
+
{#each transcriptTurns as turn (turn.key)}
|
|
441
|
+
{#if turn.kind === 'user'}
|
|
442
|
+
<div class="text-body text-foreground">
|
|
443
|
+
{turn.message.text}
|
|
268
444
|
</div>
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
445
|
+
{:else}
|
|
446
|
+
<!-- The newest turn is the one that moves; the others are still pictures. -->
|
|
447
|
+
<AgentTurn
|
|
448
|
+
look={turn.isNewest ? newestAvatarLook : stillAvatarLook}
|
|
449
|
+
renderAgentAvatar={isMascotEnabled ? assistantAvatar : undefined}
|
|
450
|
+
>
|
|
451
|
+
{#each turn.messages as message, messageIndex (message.id)}
|
|
452
|
+
<p
|
|
453
|
+
class="text-body text-muted-foreground {messageIndex === 0
|
|
454
|
+
? 'flex min-h-7 items-center'
|
|
455
|
+
: ''}"
|
|
456
|
+
>
|
|
457
|
+
{message.text}
|
|
458
|
+
</p>
|
|
459
|
+
{/each}
|
|
460
|
+
{#if turn.isNewest}
|
|
461
|
+
{#if ui.isStreaming}
|
|
462
|
+
<p class="text-caption text-muted-foreground flex min-h-7 items-center" aria-live="polite">{$t('editor.embedAssistant.working')}</p>
|
|
463
|
+
{/if}
|
|
464
|
+
{@render pendingQuestionCard()}
|
|
465
|
+
{#if ui.lastError}
|
|
466
|
+
<p class="text-caption text-destructive flex min-h-7 items-center" role="alert">{ui.lastError}</p>
|
|
467
|
+
{/if}
|
|
468
|
+
{/if}
|
|
469
|
+
</AgentTurn>
|
|
470
|
+
{/if}
|
|
471
|
+
{/each}
|
|
277
472
|
</div>
|
|
278
473
|
<footer class="border-border border-t px-4 py-3">
|
|
279
474
|
{#if ui.showCopyPrimary}
|
|
280
|
-
|
|
475
|
+
<!-- Secondary, like the buttons of the chat cards: the editor keeps one main call to action. -->
|
|
476
|
+
<Button class="mb-2 w-full" variant="secondary" onclick={() => dispatch('copyEmbedCode')}>
|
|
281
477
|
{$t('editor.embedAssistant.copyEmbedCode')}
|
|
282
478
|
</Button>
|
|
283
479
|
{/if}
|
|
284
|
-
|
|
480
|
+
<!-- `relative`: the grey words are drawn on a layer placed against the nearest positioned parent of the box -->
|
|
481
|
+
<div class="relative flex gap-2">
|
|
285
482
|
<input
|
|
286
483
|
class="text-body text-foreground bg-accent border-border min-w-0 flex-1 rounded-lg border px-3 py-2"
|
|
287
484
|
placeholder={$t('editor.embedAssistant.composerPlaceholder')}
|
|
288
485
|
bind:value={draft}
|
|
289
486
|
disabled={ui.isStreaming}
|
|
487
|
+
use:inlineCompletion={{
|
|
488
|
+
source: completion?.source ?? null,
|
|
489
|
+
value: draft,
|
|
490
|
+
// The box is shut while the assistant answers, and so are its suggestions
|
|
491
|
+
disabled: ui.isStreaming,
|
|
492
|
+
onEvent: completion?.onEvent,
|
|
493
|
+
onChange: handleSuggestionChange,
|
|
494
|
+
announce: describeSuggestion,
|
|
495
|
+
log: logCompletion,
|
|
496
|
+
}}
|
|
290
497
|
on:keydown={(event) => {
|
|
291
498
|
if (event.key === 'Enter' && !event.shiftKey) {
|
|
292
499
|
event.preventDefault();
|
|
@@ -298,6 +505,21 @@
|
|
|
298
505
|
{$t('editor.embedAssistant.send')}
|
|
299
506
|
</Button>
|
|
300
507
|
</div>
|
|
508
|
+
{#if isHintLineKept}
|
|
509
|
+
<!-- A line of its own once it has been needed, so the panel does not move as suggestions come and go. A screen reader is told by the box itself. -->
|
|
510
|
+
<p
|
|
511
|
+
class="text-caption text-muted-foreground mt-2 flex h-5 items-center gap-1.5"
|
|
512
|
+
data-testid="embed-assistant-suggestion-hint"
|
|
513
|
+
aria-hidden="true"
|
|
514
|
+
>
|
|
515
|
+
{#if suggestionShows}
|
|
516
|
+
<kbd class="border-border bg-accent text-caption rounded-sm border px-1.5 font-sans"
|
|
517
|
+
>{$t('editor.embedAssistant.suggestionTabKey')}</kbd
|
|
518
|
+
>
|
|
519
|
+
<span>{$t('editor.embedAssistant.suggestionTabHint')}</span>
|
|
520
|
+
{/if}
|
|
521
|
+
</p>
|
|
522
|
+
{/if}
|
|
301
523
|
</footer>
|
|
302
524
|
</aside>
|
|
303
525
|
{/if}
|
|
@@ -22,10 +22,14 @@
|
|
|
22
22
|
|
|
23
23
|
<script lang="ts">
|
|
24
24
|
import { onDestroy } from 'svelte';
|
|
25
|
+
// The number control is the design system's: the one component the editor and the canvas panel draw
|
|
26
|
+
import { NumberControls } from '@widgetic/design-system/components';
|
|
25
27
|
import InputControllerRow from './InputControllerRow.svelte';
|
|
26
|
-
import
|
|
28
|
+
import { useEditorLanguage } from '../../i18n/language';
|
|
27
29
|
import { normalizeAngleDegrees } from '../../utils/angleMath';
|
|
28
30
|
|
|
31
|
+
const { t } = useEditorLanguage();
|
|
32
|
+
|
|
29
33
|
export let label: AngleInputControllerProps['label'];
|
|
30
34
|
export let value: AngleInputControllerProps['value'] = 0;
|
|
31
35
|
export let onChange: AngleInputControllerProps['onChange'];
|
|
@@ -103,6 +107,15 @@
|
|
|
103
107
|
}
|
|
104
108
|
}
|
|
105
109
|
|
|
110
|
+
/**
|
|
111
|
+
* A number typed or stepped in the field: the dial's needle follows it at once (the control used to write it back into
|
|
112
|
+
* `value` through `bind:value`), and the page is told.
|
|
113
|
+
*/
|
|
114
|
+
function handleNumberControlsChange(newValue: number) {
|
|
115
|
+
value = newValue;
|
|
116
|
+
onChange(newValue);
|
|
117
|
+
}
|
|
118
|
+
|
|
106
119
|
function handleMouseDown(event: MouseEvent) {
|
|
107
120
|
if (!circleContainer) return;
|
|
108
121
|
|
|
@@ -192,14 +205,16 @@
|
|
|
192
205
|
<NumberControls
|
|
193
206
|
class="min-w-0 flex-1"
|
|
194
207
|
surfacePaddingClass="pe-1.5"
|
|
195
|
-
|
|
196
|
-
{
|
|
208
|
+
{value}
|
|
209
|
+
onChange={handleNumberControlsChange}
|
|
197
210
|
{min}
|
|
198
211
|
{max}
|
|
199
212
|
{step}
|
|
200
213
|
{onFocus}
|
|
201
214
|
wrapAround={true}
|
|
202
215
|
suffix="°"
|
|
216
|
+
decreaseLabel={$t('editor.stepper.decrease')}
|
|
217
|
+
increaseLabel={$t('editor.stepper.increase')}
|
|
203
218
|
/>
|
|
204
219
|
</div>
|
|
205
220
|
</InputControllerRow>
|
|
@@ -40,8 +40,12 @@
|
|
|
40
40
|
// Svelte imports
|
|
41
41
|
import { onDestroy } from 'svelte';
|
|
42
42
|
|
|
43
|
+
// The number control is the design system's: the one component the editor and the canvas panel draw
|
|
44
|
+
import { NumberControls } from '@widgetic/design-system/components';
|
|
43
45
|
import InputControllerRow from './InputControllerRow.svelte';
|
|
44
|
-
import
|
|
46
|
+
import { useEditorLanguage } from '../../i18n/language';
|
|
47
|
+
|
|
48
|
+
const { t } = useEditorLanguage();
|
|
45
49
|
|
|
46
50
|
/**
|
|
47
51
|
* Component Props
|
|
@@ -469,5 +473,15 @@
|
|
|
469
473
|
</script>
|
|
470
474
|
|
|
471
475
|
<InputControllerRow {label} {helpText} {description}>
|
|
472
|
-
<NumberControls
|
|
476
|
+
<NumberControls
|
|
477
|
+
{value}
|
|
478
|
+
{onChange}
|
|
479
|
+
{min}
|
|
480
|
+
{max}
|
|
481
|
+
{step}
|
|
482
|
+
{isLocked}
|
|
483
|
+
{onFocus}
|
|
484
|
+
decreaseLabel={$t('editor.stepper.decrease')}
|
|
485
|
+
increaseLabel={$t('editor.stepper.increase')}
|
|
486
|
+
/>
|
|
473
487
|
</InputControllerRow>
|
|
@@ -14,6 +14,9 @@
|
|
|
14
14
|
* - a save can name the content version it was made from (`ifMatchVersion`, sent as `If-Match`). When somebody
|
|
15
15
|
* else saved the content since, the API refuses it (412 `CONTENT_VERSION_MISMATCH`, with the version it holds
|
|
16
16
|
* now in `details`) instead of replacing their work, and the error says so (`versionConflict`);
|
|
17
|
+
* - a read can name the content version the editor shows (`getCompositionIfChanged`, sent as `If-None-Match`). The API
|
|
18
|
+
* answers 304 with no body when it holds the same version, so a tab that comes back can ask "is this still the latest?"
|
|
19
|
+
* for the price of a header, and is given the composition only when somebody saved a newer one;
|
|
17
20
|
* - every failure is a `CompositionApiError` with the API's own code, so the host can tell an ended session
|
|
18
21
|
* (`EDITOR_SESSION_EXPIRED`...) from a missing composition (`NOT_FOUND`) from a widget that was never
|
|
19
22
|
* published (`WIDGET_NOT_PUBLISHED`);
|
|
@@ -154,9 +157,31 @@ export declare class CompositionApiError extends Error {
|
|
|
154
157
|
/** True when sending the same request again later may work: nothing was refused, the network or the server failed. */
|
|
155
158
|
get retryable(): boolean;
|
|
156
159
|
}
|
|
160
|
+
/** Options of a read that is asked only to answer when the composition changed. */
|
|
161
|
+
export interface GetCompositionIfChangedOptions extends CompositionRequestOptions {
|
|
162
|
+
/**
|
|
163
|
+
* The content version the caller shows. It goes in the `If-None-Match` header, so the API answers `notModified` (304, no
|
|
164
|
+
* body) when it holds that same version. Left out, the composition is always given.
|
|
165
|
+
*/
|
|
166
|
+
ifNoneMatchVersion?: number;
|
|
167
|
+
}
|
|
168
|
+
/** What a read that is asked only to answer when the composition changed came to. */
|
|
169
|
+
export type CompositionConditionalAnswer = {
|
|
170
|
+
status: 'notModified';
|
|
171
|
+
} | {
|
|
172
|
+
status: 'changed';
|
|
173
|
+
composition: JsonRecord;
|
|
174
|
+
};
|
|
157
175
|
/** What a client of the composition routes can do. */
|
|
158
176
|
export interface CompositionApi {
|
|
159
177
|
getComposition(compositionId: string, options?: CompositionRequestOptions): Promise<JsonRecord>;
|
|
178
|
+
/**
|
|
179
|
+
* Reads the composition only when its content version is not `ifNoneMatchVersion` (a conditional GET): the answer is
|
|
180
|
+
* `notModified` when nothing newer was saved, and carries the composition when it was. It is what a tab that comes back
|
|
181
|
+
* asks, to learn whether the copy it shows is out of date. Optional for a client made by hand (a test's, a host's):
|
|
182
|
+
* whoever uses it falls back on `getComposition` and compares the versions itself.
|
|
183
|
+
*/
|
|
184
|
+
getCompositionIfChanged?(compositionId: string, options?: GetCompositionIfChangedOptions): Promise<CompositionConditionalAnswer>;
|
|
160
185
|
getPreview(compositionId: string, options?: CompositionRequestOptions): Promise<CompositionPreviewInfo>;
|
|
161
186
|
getContentSchema(compositionId: string, options?: CompositionRequestOptions): Promise<unknown>;
|
|
162
187
|
getDesignSchema(compositionId: string, options?: CompositionRequestOptions): Promise<unknown>;
|
|
@@ -14,6 +14,9 @@
|
|
|
14
14
|
* - a save can name the content version it was made from (`ifMatchVersion`, sent as `If-Match`). When somebody
|
|
15
15
|
* else saved the content since, the API refuses it (412 `CONTENT_VERSION_MISMATCH`, with the version it holds
|
|
16
16
|
* now in `details`) instead of replacing their work, and the error says so (`versionConflict`);
|
|
17
|
+
* - a read can name the content version the editor shows (`getCompositionIfChanged`, sent as `If-None-Match`). The API
|
|
18
|
+
* answers 304 with no body when it holds the same version, so a tab that comes back can ask "is this still the latest?"
|
|
19
|
+
* for the price of a header, and is given the composition only when somebody saved a newer one;
|
|
17
20
|
* - every failure is a `CompositionApiError` with the API's own code, so the host can tell an ended session
|
|
18
21
|
* (`EDITOR_SESSION_EXPIRED`...) from a missing composition (`NOT_FOUND`) from a widget that was never
|
|
19
22
|
* published (`WIDGET_NOT_PUBLISHED`);
|
|
@@ -229,6 +232,8 @@ export function createCompositionApi(options) {
|
|
|
229
232
|
headers['Idempotency-Key'] = extras.idempotencyKey;
|
|
230
233
|
if (extras.ifMatch)
|
|
231
234
|
headers['If-Match'] = extras.ifMatch;
|
|
235
|
+
if (extras.ifNoneMatch)
|
|
236
|
+
headers['If-None-Match'] = extras.ifNoneMatch;
|
|
232
237
|
try {
|
|
233
238
|
const response = await fetchImplementation(url, {
|
|
234
239
|
method,
|
|
@@ -302,10 +307,11 @@ export function createCompositionApi(options) {
|
|
|
302
307
|
return unwrapApiData(parsed);
|
|
303
308
|
}
|
|
304
309
|
/**
|
|
305
|
-
* A request with the page's token. When the API refuses the token (401) the page is asked for
|
|
306
|
-
* request is sent again once with it, unless the page gives the same one back: that would only be
|
|
310
|
+
* A request with the page's token, answered as it came. When the API refuses the token (401) the page is asked for
|
|
311
|
+
* another, and the request is sent again once with it, unless the page gives the same one back: that would only be
|
|
312
|
+
* refused again.
|
|
307
313
|
*/
|
|
308
|
-
async function
|
|
314
|
+
async function send(method, path, extras = {}) {
|
|
309
315
|
const url = `${apiBasePath}${path}`;
|
|
310
316
|
throwIfAborted(extras.signal);
|
|
311
317
|
const firstToken = await tokenFor('initial');
|
|
@@ -317,7 +323,11 @@ export function createCompositionApi(options) {
|
|
|
317
323
|
if (newToken !== firstToken)
|
|
318
324
|
answer = await attempt(method, url, newToken, extras);
|
|
319
325
|
}
|
|
320
|
-
return
|
|
326
|
+
return answer;
|
|
327
|
+
}
|
|
328
|
+
/** A request whose answer is read: the payload of a good one, or the error the API described. */
|
|
329
|
+
async function request(method, path, extras = {}) {
|
|
330
|
+
return interpret(await send(method, path, extras));
|
|
321
331
|
}
|
|
322
332
|
function compositionPath(compositionId, suffix = '') {
|
|
323
333
|
if (typeof compositionId !== 'string' || compositionId.trim() === '') {
|
|
@@ -360,6 +370,26 @@ export function createCompositionApi(options) {
|
|
|
360
370
|
throw invalidResponse('The API gave no composition.');
|
|
361
371
|
return record;
|
|
362
372
|
},
|
|
373
|
+
async getCompositionIfChanged(compositionId, requestOptions = {}) {
|
|
374
|
+
const { ifNoneMatchVersion, signal } = requestOptions;
|
|
375
|
+
if (ifNoneMatchVersion !== undefined &&
|
|
376
|
+
!(Number.isSafeInteger(ifNoneMatchVersion) && ifNoneMatchVersion >= 0)) {
|
|
377
|
+
throw new TypeError('A content version is a whole number of zero or more');
|
|
378
|
+
}
|
|
379
|
+
const answer = await send('GET', compositionPath(compositionId), {
|
|
380
|
+
signal,
|
|
381
|
+
// Quoted, the way the API writes the ETag of a composition.
|
|
382
|
+
ifNoneMatch: ifNoneMatchVersion === undefined ? undefined : `"${ifNoneMatchVersion}"`
|
|
383
|
+
});
|
|
384
|
+
// 304 has no body: the API holds the version that was named, so there is nothing newer to read.
|
|
385
|
+
if (answer.status === 304 && ifNoneMatchVersion !== undefined) {
|
|
386
|
+
return { status: 'notModified' };
|
|
387
|
+
}
|
|
388
|
+
const record = interpret(answer);
|
|
389
|
+
if (!isRecord(record) || typeof record.id !== 'string')
|
|
390
|
+
throw invalidResponse('The API gave no composition.');
|
|
391
|
+
return { status: 'changed', composition: record };
|
|
392
|
+
},
|
|
363
393
|
async getPreview(compositionId, requestOptions = {}) {
|
|
364
394
|
const preview = await request('GET', compositionPath(compositionId, '/preview'), requestOptions);
|
|
365
395
|
if (!isRecord(preview) || typeof preview.previewUrl !== 'string') {
|