@forumone/throughline 2.1.0 → 2.2.0-next-623d42c
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 +41 -0
- package/dist/approvals/endpoints/action.d.ts.map +1 -1
- package/dist/approvals/endpoints/action.js +27 -8
- package/dist/approvals/endpoints/action.js.map +1 -1
- package/dist/approvals/tokens.d.ts +3 -0
- package/dist/approvals/tokens.d.ts.map +1 -1
- package/dist/approvals/tokens.js +1 -1
- package/dist/approvals/tokens.js.map +1 -1
- package/dist/authoring/tools.d.ts.map +1 -1
- package/dist/authoring/tools.js +6 -1
- package/dist/authoring/tools.js.map +1 -1
- package/dist/components/tools/validate-composition.d.ts.map +1 -1
- package/dist/components/tools/validate-composition.js +4 -1
- package/dist/components/tools/validate-composition.js.map +1 -1
- package/dist/components/validation/composition.d.ts +9 -1
- package/dist/components/validation/composition.d.ts.map +1 -1
- package/dist/components/validation/composition.js +9 -7
- package/dist/components/validation/composition.js.map +1 -1
- package/dist/exports/client.d.ts +3 -0
- package/dist/exports/client.d.ts.map +1 -1
- package/dist/exports/client.js +2 -0
- package/dist/exports/client.js.map +1 -1
- package/dist/fields/slug.d.ts.map +1 -1
- package/dist/fields/slug.js +4 -1
- package/dist/fields/slug.js.map +1 -1
- package/dist/integrations/admin/SyncButton.d.ts.map +1 -1
- package/dist/integrations/admin/SyncButton.js +11 -5
- package/dist/integrations/admin/SyncButton.js.map +1 -1
- package/dist/integrations/admin/sync-client.d.ts +2 -0
- package/dist/integrations/admin/sync-client.d.ts.map +1 -1
- package/dist/integrations/admin/sync-client.js +7 -1
- package/dist/integrations/admin/sync-client.js.map +1 -1
- package/dist/integrations/collection.d.ts +1 -1
- package/dist/integrations/collection.d.ts.map +1 -1
- package/dist/integrations/collection.js +11 -4
- package/dist/integrations/collection.js.map +1 -1
- package/dist/integrations/sync/status.d.ts +17 -4
- package/dist/integrations/sync/status.d.ts.map +1 -1
- package/dist/integrations/sync/status.js +37 -6
- package/dist/integrations/sync/status.js.map +1 -1
- package/dist/media/hooks.d.ts.map +1 -1
- package/dist/media/hooks.js +11 -9
- package/dist/media/hooks.js.map +1 -1
- package/dist/migrate/exports.json +16 -0
- package/dist/publishing/admin/FirstErrorProvider.d.ts +24 -0
- package/dist/publishing/admin/FirstErrorProvider.d.ts.map +1 -0
- package/dist/publishing/admin/FirstErrorProvider.js +100 -0
- package/dist/publishing/admin/FirstErrorProvider.js.map +1 -0
- package/dist/publishing/admin/PublishButton.d.ts.map +1 -1
- package/dist/publishing/admin/PublishButton.js +18 -3
- package/dist/publishing/admin/PublishButton.js.map +1 -1
- package/dist/publishing/admin/SchedulePublishField.d.ts.map +1 -1
- package/dist/publishing/admin/SchedulePublishField.js +25 -10
- package/dist/publishing/admin/SchedulePublishField.js.map +1 -1
- package/dist/publishing/admin/UnpublishButton.d.ts.map +1 -1
- package/dist/publishing/admin/UnpublishButton.js +9 -3
- package/dist/publishing/admin/UnpublishButton.js.map +1 -1
- package/dist/publishing/admin/first-error.d.ts +60 -0
- package/dist/publishing/admin/first-error.d.ts.map +1 -0
- package/dist/publishing/admin/first-error.js +211 -0
- package/dist/publishing/admin/first-error.js.map +1 -0
- package/dist/publishing/admin/publishing-client.d.ts +33 -4
- package/dist/publishing/admin/publishing-client.d.ts.map +1 -1
- package/dist/publishing/admin/publishing-client.js +56 -21
- package/dist/publishing/admin/publishing-client.js.map +1 -1
- package/dist/publishing/admin/schedule-state.d.ts +31 -4
- package/dist/publishing/admin/schedule-state.d.ts.map +1 -1
- package/dist/publishing/admin/schedule-state.js +26 -14
- package/dist/publishing/admin/schedule-state.js.map +1 -1
- package/dist/publishing/checks/alt-text.d.ts.map +1 -1
- package/dist/publishing/checks/alt-text.js +3 -1
- package/dist/publishing/checks/alt-text.js.map +1 -1
- package/dist/publishing/checks/heading-hierarchy.d.ts +9 -3
- package/dist/publishing/checks/heading-hierarchy.d.ts.map +1 -1
- package/dist/publishing/checks/heading-hierarchy.js +19 -6
- package/dist/publishing/checks/heading-hierarchy.js.map +1 -1
- package/dist/publishing/checks/link-labels.js +1 -1
- package/dist/publishing/checks/link-labels.js.map +1 -1
- package/dist/publishing/endpoints/admin.d.ts.map +1 -1
- package/dist/publishing/endpoints/admin.js +26 -7
- package/dist/publishing/endpoints/admin.js.map +1 -1
- package/dist/publishing/events.d.ts +15 -1
- package/dist/publishing/events.d.ts.map +1 -1
- package/dist/publishing/events.js +17 -2
- package/dist/publishing/events.js.map +1 -1
- package/dist/publishing/hooks/block-status-writes.js +5 -2
- package/dist/publishing/hooks/block-status-writes.js.map +1 -1
- package/dist/publishing/hooks/schedule-events.d.ts.map +1 -1
- package/dist/publishing/hooks/schedule-events.js +5 -7
- package/dist/publishing/hooks/schedule-events.js.map +1 -1
- package/dist/publishing/index.d.ts +9 -1
- package/dist/publishing/index.d.ts.map +1 -1
- package/dist/publishing/index.js +7 -0
- package/dist/publishing/index.js.map +1 -1
- package/dist/publishing/messages.d.ts +63 -0
- package/dist/publishing/messages.d.ts.map +1 -0
- package/dist/publishing/messages.js +84 -0
- package/dist/publishing/messages.js.map +1 -0
- package/dist/publishing/options.d.ts +46 -1
- package/dist/publishing/options.d.ts.map +1 -1
- package/dist/publishing/options.js +8 -0
- package/dist/publishing/options.js.map +1 -1
- package/dist/publishing/pipeline/finish.d.ts +12 -0
- package/dist/publishing/pipeline/finish.d.ts.map +1 -0
- package/dist/publishing/pipeline/finish.js +24 -0
- package/dist/publishing/pipeline/finish.js.map +1 -0
- package/dist/publishing/pipeline/index.d.ts.map +1 -1
- package/dist/publishing/pipeline/index.js +11 -8
- package/dist/publishing/pipeline/index.js.map +1 -1
- package/dist/publishing/pipeline/steps/accessibility.d.ts +3 -3
- package/dist/publishing/pipeline/steps/accessibility.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/accessibility.js +17 -9
- package/dist/publishing/pipeline/steps/accessibility.js.map +1 -1
- package/dist/publishing/pipeline/steps/approval.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/approval.js +6 -4
- package/dist/publishing/pipeline/steps/approval.js.map +1 -1
- package/dist/publishing/pipeline/steps/composition.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/composition.js +36 -17
- package/dist/publishing/pipeline/steps/composition.js.map +1 -1
- package/dist/publishing/pipeline/steps/embargo.d.ts +4 -0
- package/dist/publishing/pipeline/steps/embargo.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/embargo.js +13 -4
- package/dist/publishing/pipeline/steps/embargo.js.map +1 -1
- package/dist/publishing/pipeline/steps/execute.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/execute.js +48 -5
- package/dist/publishing/pipeline/steps/execute.js.map +1 -1
- package/dist/publishing/pipeline/steps/exist.d.ts +2 -0
- package/dist/publishing/pipeline/steps/exist.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/exist.js +5 -3
- package/dist/publishing/pipeline/steps/exist.js.map +1 -1
- package/dist/publishing/pipeline/steps/link-targets.d.ts +3 -0
- package/dist/publishing/pipeline/steps/link-targets.d.ts.map +1 -0
- package/dist/publishing/pipeline/steps/link-targets.js +293 -0
- package/dist/publishing/pipeline/steps/link-targets.js.map +1 -0
- package/dist/publishing/pipeline/steps/required-fields.d.ts.map +1 -1
- package/dist/publishing/pipeline/steps/required-fields.js +7 -5
- package/dist/publishing/pipeline/steps/required-fields.js.map +1 -1
- package/dist/publishing/pipeline/types.d.ts +25 -0
- package/dist/publishing/pipeline/types.d.ts.map +1 -1
- package/dist/publishing/pipeline/where.d.ts +13 -0
- package/dist/publishing/pipeline/where.d.ts.map +1 -0
- package/dist/publishing/pipeline/where.js +44 -0
- package/dist/publishing/pipeline/where.js.map +1 -0
- package/dist/publishing/plugin.d.ts.map +1 -1
- package/dist/publishing/plugin.js +22 -0
- package/dist/publishing/plugin.js.map +1 -1
- package/dist/publishing/service.d.ts +26 -17
- package/dist/publishing/service.d.ts.map +1 -1
- package/dist/publishing/service.js +43 -32
- package/dist/publishing/service.js.map +1 -1
- package/dist/publishing/tools/get-publish-status.d.ts.map +1 -1
- package/dist/publishing/tools/get-publish-status.js +4 -0
- package/dist/publishing/tools/get-publish-status.js.map +1 -1
- package/dist/publishing/tools/rollback.d.ts.map +1 -1
- package/dist/publishing/tools/rollback.js +1 -1
- package/dist/publishing/tools/rollback.js.map +1 -1
- package/dist/references/UsedOnPanel.d.ts.map +1 -1
- package/dist/references/UsedOnPanel.js +1 -1
- package/dist/references/UsedOnPanel.js.map +1 -1
- package/dist/references/find.d.ts +12 -1
- package/dist/references/find.d.ts.map +1 -1
- package/dist/references/find.js +24 -5
- package/dist/references/find.js.map +1 -1
- package/dist/references/guards.d.ts.map +1 -1
- package/dist/references/guards.js +9 -2
- package/dist/references/guards.js.map +1 -1
- package/dist/references/index.d.ts +4 -2
- package/dist/references/index.d.ts.map +1 -1
- package/dist/references/index.js +2 -1
- package/dist/references/index.js.map +1 -1
- package/dist/references/links.d.ts +45 -0
- package/dist/references/links.d.ts.map +1 -0
- package/dist/references/links.js +117 -0
- package/dist/references/links.js.map +1 -0
- package/dist/references/walk.d.ts +70 -0
- package/dist/references/walk.d.ts.map +1 -1
- package/dist/references/walk.js +88 -41
- package/dist/references/walk.js.map +1 -1
- package/dist/utils/field-path.d.ts +56 -0
- package/dist/utils/field-path.d.ts.map +1 -0
- package/dist/utils/field-path.js +146 -0
- package/dist/utils/field-path.js.map +1 -0
- package/package.json +6 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,46 @@
|
|
|
1
1
|
# @forumone/throughline
|
|
2
2
|
|
|
3
|
+
## 2.2.0-next-623d42c
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- 623d42c: Messages an editor can read now make sense to an editor: they say what happened in the editor's terms, what to do next, and to "tell a site administrator" when only somebody else can fix it. (forumone-2026#805)
|
|
8
|
+
|
|
9
|
+
- **The publish-blocked notification lists issues where the editor finds them.** It no longer starts "Blocked at: composition", lists `layout[2]: …` or `(root): …`, or prefixes "Suggestion:". Every pipeline issue gains `where`, its `field` as the collection's labels say it — `Block 3 (Image Hero) › Image`, `SEO › Title` — computed from the field config for built-in and custom checks alike, and the admin prints it before the message. An issue marked on an ancestor field (three blocks' problems on `layout`) says which block it is about.
|
|
10
|
+
- **Components are named by their block's label,** not their contract name. The composition validator takes a `label` function; the publish step passes each block's `labels.singular`, and the `validate_composition` MCP tool keeps contract names. `componentDisplayName` (`ImageHero` → `Image Hero`) is exported from `@forumone/throughline-design-system/contract`.
|
|
11
|
+
- **Every step's wording is rewritten** — not found, already published, composition, accessibility, required fields, embargo, expiry, approval, document locked (now naming who holds the lock), field validation — as are the individual checks (alt text, link text, SEO title and description, slug) and the composition rules (unknown component, unknown variant, forbidden neighbours, maximum per page, placement, recipes, empty block). Tests and hosts asserting the old strings need updating; `code`, `rule`, `failedAt` and `field` are unchanged.
|
|
12
|
+
- **Setup problems no editor can fix** (`components-server-missing`, `approval-resolver-missing`, a collection not registered as publishable) say to tell a site administrator. The setup instruction moves to a new `detail` field, which is logged and still returned to MCP callers.
|
|
13
|
+
- **Dates read like dates.** An embargo's end or an expiry is written `Tue 6 Oct 2026, 1:00 pm UTC` in the zone set by the new `publishing.timeZone` option (IANA, default `UTC`), and returned as `when: { at, text }`; the admin rewrites it into each editor's own zone.
|
|
14
|
+
- **Connection and server problems** in the admin say whether anything changed and what to do. A malformed request to the publishing endpoints reads as an unexpected problem, with the specifics in `detail`.
|
|
15
|
+
- **Unpublish, schedule and cancel** results carry a `code` (`not-found`, `not-published`, `not-scheduled`, `invalid-time`, `time-in-past`), and cancelling a schedule when nothing was scheduled no longer reports success. The trust boundary's refusal of a direct `_status` write (bulk publish, restore as published) tells the editor to use the document's own Publish or Unpublish button.
|
|
16
|
+
- **A failed event after a publish** warns in terms of what the editor will see; which event and why go to the log.
|
|
17
|
+
- **Composition warnings are no longer dropped.** A component missing the sibling its contract `requiredSiblings` names now reaches the publish result's `warnings`.
|
|
18
|
+
- **The one-hero check fires.** `heading-hierarchy` matched only a block typed `hero`, which no design system has, so it never ran. It now counts blocks whose contract `category` is `hero` (custom checks receive a third `context` argument with the components), falling back to the old match without the components plugin.
|
|
19
|
+
- **The in-use refusal reaches the editor.** It was a non-public 500, which Payload replaces with "Something went wrong."; it is now a public 503. Its list names each document's collection by its singular label and the place by its field labels: `• Case Study › Acme rebrand (Layout › Block 2 (Card Grid) › Card 1 › Image)`. References carry `dataPath` and `where`.
|
|
20
|
+
- **`refuseSlugHeldInTrash`, `refuseMimeTypesOutside` and `refuseStorageKeyMismatch`** pass `req.t` to `ValidationError`, so a site's translation of "The following field is invalid:" applies. The upload-path refusals are rewritten, and the two storage paths are logged instead of shown.
|
|
21
|
+
- **Integrations:** an unknown type or invalid settings is now an `APIError` 400, which Payload shows, instead of an `Error` it replaced with "Something went wrong.". `lastError` opens with a one-line summary anybody can read before the integration's own detail.
|
|
22
|
+
- **Approval links:** an invalid, expired or withdrawn link says so in plain words and what to do; why a token failed goes to the log.
|
|
23
|
+
- **Generated blocks:** the "needed once anything else here is filled in" message names fields by their label ("Video URL"), not their name (`src`).
|
|
24
|
+
|
|
25
|
+
- 623d42c: Error toasts stay until they are read, and a failed save takes the editor to the field that is wrong. (forumone-2026#805)
|
|
26
|
+
|
|
27
|
+
- **Go to the first error.** After a Save, Publish or Schedule that fails — never after an autosave — the admin opens the tab or collapsed block or array row the first invalid field is in, scrolls it into view below the sticky header (a jump instead of a smooth scroll under `prefers-reduced-motion`) and focuses its input. The publishing plugin registers it as `FirstErrorProvider` in `admin.components.providers`; `publishing.goToFirstError: false` leaves it out. `goToFirstError()` is exported from `@forumone/throughline/client` for a host's own controls.
|
|
28
|
+
- **Run `payload generate:importmap` after upgrading.** A provider missing from the import map renders nothing, and since a provider wraps the whole admin, the admin would render blank.
|
|
29
|
+
- **Errors stay until closed, and replace rather than stack.** The Publish, Unpublish, Schedule and Sync controls' error toasts last until dismissed and carry a stable id per document, so a second click replaces the first toast. A blocked publish or schedule with marked fields has a **Show me** action. A success clears the error.
|
|
30
|
+
- **Cancelling a schedule when nothing was scheduled** says "There was nothing scheduled." rather than "Schedule cancelled". The Schedule control's other text is rewritten too, and its times use the same `Tue 6 Oct 2026, 9:00 am EDT` form as every other date.
|
|
31
|
+
|
|
32
|
+
- 332baf9: Publishing refuses a page whose internal links go to a draft, trashed or deleted document (forumone-2026#756). A new pipeline step, `link-targets`, runs after `required-fields` and looks up every link's target. A deleted target, a trashed one, or an unpublished one in a collection with drafts blocks the publish (`code: 'link-targets'`). Each issue names the block or field and the target's title, and its `field` is the link's own path, so the admin marks it. An unpublished target with a scheduled publish time is a warning, not a block.
|
|
33
|
+
|
|
34
|
+
**This is a new blocking step, and it's on by default.** After upgrading, a page that already links to a draft or trashed page can't be published until the link is fixed. `get_publish_status` and `check` report it like any other blocker. To switch it off, set `publishing: { linkTargets: { enabled: false } }`.
|
|
35
|
+
|
|
36
|
+
A link is either an internal link in Lexical rich text, or a relationship field marked with `custom: { throughlineLinkTarget: true }`. The design-system generator's `linkField` now marks its `reference`, so every generated link is covered without changes. To cover a hand-written link field, wrap it in `markLinkTarget` from `@forumone/throughline/publishing`. A marked reference whose sibling `mode` isn't `internal` is ignored, and `markLinkTarget(field, { when })` takes a different rule. The structural walk behind `referencesIn` is now `walkDocument`, exported from `/media` along with `linkTargetsIn`.
|
|
37
|
+
|
|
38
|
+
### Patch Changes
|
|
39
|
+
|
|
40
|
+
- Updated dependencies [623d42c]
|
|
41
|
+
- Updated dependencies [332baf9]
|
|
42
|
+
- @forumone/throughline-design-system@2.2.0-next-623d42c
|
|
43
|
+
|
|
3
44
|
## 2.1.0
|
|
4
45
|
|
|
5
46
|
### Minor Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/approvals/endpoints/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAI3D,OAAO,EAEL,KAAK,YAAY,EAElB,MAAM,cAAc,CAAA;AAErB,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,sBAAsB,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;IACzD,WAAW,EAAE,WAAW,CAAA;CACzB;AAqBD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"action.d.ts","sourceRoot":"","sources":["../../../src/approvals/endpoints/action.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAA;AAI3D,OAAO,EAEL,KAAK,YAAY,EAElB,MAAM,cAAc,CAAA;AAErB,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,sBAAsB,GAAG;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;IACzD,WAAW,EAAE,WAAW,CAAA;CACzB;AAqBD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,wBAAwB,GAAG,QAAQ,CA8J7E;AAED,kFAAkF;AAClF,MAAM,MAAM,kBAAkB,GAAG,YAAY,CAAA;AAE7C,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,sBAAsB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GACxD,OAAO,CAAC;IAAE,YAAY,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,CAAC,CAQnF"}
|
|
@@ -37,30 +37,37 @@ export function createActionEndpoint(deps) {
|
|
|
37
37
|
const url = new URL(req.url ?? 'http://localhost');
|
|
38
38
|
const token = url.searchParams.get('token');
|
|
39
39
|
if (!token)
|
|
40
|
-
return htmlResponse(renderError(
|
|
40
|
+
return htmlResponse(renderError(LINK_INVALID), 400);
|
|
41
|
+
/*
|
|
42
|
+
The person reading these clicked a link in an email (forumone-2026#805).
|
|
43
|
+
Why a token failed — its format, its signature — is for the log; what
|
|
44
|
+
they need is whether the link is any good and what to do instead.
|
|
45
|
+
*/
|
|
41
46
|
const verification = await verifyActionToken(token, deps.options.tokenSecret);
|
|
42
47
|
if (!verification.ok) {
|
|
43
|
-
|
|
48
|
+
req.payload.logger.warn(`[approvals] refused an action link: ${verification.error}`);
|
|
49
|
+
return htmlResponse(renderError(verification.expired ? LINK_EXPIRED : LINK_INVALID), 401);
|
|
44
50
|
}
|
|
45
51
|
const collectionSlug = deps.options.collectionSlug ?? DEFAULT_APPROVALS_SLUG;
|
|
46
52
|
const approval = (await req.payload.findByID({
|
|
47
53
|
collection: collectionSlug,
|
|
48
54
|
id: verification.token.approvalId,
|
|
49
55
|
}));
|
|
50
|
-
if (!approval)
|
|
51
|
-
return htmlResponse(renderError('
|
|
56
|
+
if (!approval) {
|
|
57
|
+
return htmlResponse(renderError('This approval request no longer exists. It may have been withdrawn.'), 404);
|
|
58
|
+
}
|
|
52
59
|
const status = String(approval['status']);
|
|
53
60
|
if (status !== 'pending') {
|
|
54
|
-
return htmlResponse(renderInfo(
|
|
61
|
+
return htmlResponse(renderInfo(alreadyDecided(status)));
|
|
55
62
|
}
|
|
56
63
|
const consumed = approval['consumedTokens'] ?? [];
|
|
57
64
|
if (consumed.includes(token)) {
|
|
58
|
-
return htmlResponse(renderError('This
|
|
65
|
+
return htmlResponse(renderError('This link has already been used, so your answer is already recorded.'), 400);
|
|
59
66
|
}
|
|
60
67
|
const expiresAtRaw = approval['expiresAt'];
|
|
61
68
|
if (typeof expiresAtRaw === 'string' &&
|
|
62
69
|
Date.parse(expiresAtRaw) < Date.now()) {
|
|
63
|
-
return htmlResponse(renderInfo(
|
|
70
|
+
return htmlResponse(renderInfo("This approval request has expired, so it can't be answered any more. Ask the person who requested approval to send it again."));
|
|
64
71
|
}
|
|
65
72
|
const action = verification.token.action;
|
|
66
73
|
const confirm = url.searchParams.get('confirm') === 'true';
|
|
@@ -181,8 +188,20 @@ function renderConfirmation(args) {
|
|
|
181
188
|
function renderSuccess(label, title) {
|
|
182
189
|
return htmlPage(`<h1>${escape(label)}</h1><p>Your decision on <em>${escape(title)}</em> has been recorded.</p>`);
|
|
183
190
|
}
|
|
191
|
+
const LINK_INVALID = "This approval link isn't valid. Use the link in the most recent email about this request, or ask the person who sent it to send it again.";
|
|
192
|
+
const LINK_EXPIRED = 'This approval link has expired. Ask the person who requested approval to send a new one.';
|
|
193
|
+
const DECIDED = {
|
|
194
|
+
granted: 'approved',
|
|
195
|
+
declined: 'declined',
|
|
196
|
+
'changes-requested': 'sent back for changes',
|
|
197
|
+
expired: 'closed because it expired',
|
|
198
|
+
};
|
|
199
|
+
/** "This request has already been approved." — the stored status, in words. */
|
|
200
|
+
function alreadyDecided(status) {
|
|
201
|
+
return `This request has already been ${DECIDED[status] ?? status.replace(/-/g, ' ')}.`;
|
|
202
|
+
}
|
|
184
203
|
function renderError(message) {
|
|
185
|
-
return htmlPage(`<h1>
|
|
204
|
+
return htmlPage(`<h1>We couldn't record that</h1><p>${escape(message)}</p>`);
|
|
186
205
|
}
|
|
187
206
|
function renderInfo(message) {
|
|
188
207
|
return htmlPage(`<h1>Notice</h1><p>${escape(message)}</p>`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/approvals/endpoints/action.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAA;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AAClE,OAAO,EAGL,iBAAiB,GAClB,MAAM,cAAc,CAAA;AAOrB,MAAM,mBAAmB,GAA0D;IACjF,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,UAAU;IACnB,OAAO,EAAE,mBAAmB;CAC7B,CAAA;AAED,MAAM,kBAAkB,GAAG;IACzB,OAAO,EAAE,kBAAkB;IAC3B,OAAO,EAAE,mBAAmB;IAC5B,OAAO,EAAE,4BAA4B;CAC7B,CAAA;AAEV,MAAM,YAAY,GAAsC;IACtD,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,SAAS;IAClB,OAAO,EAAE,iBAAiB;IAC1B,OAAO,EAAE,kBAAkB;CAC5B,CAAA;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA8B;IACjE,OAAO;QACL,IAAI,EAAE,mBAAmB;QACzB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACrB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,kBAAkB,CAAC,CAAA;YAClD,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3C,IAAI,CAAC,KAAK;gBAAE,OAAO,YAAY,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"action.js","sourceRoot":"","sources":["../../../src/approvals/endpoints/action.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,10 @@ export type VerifyResult = {
|
|
|
32
32
|
token: ActionToken;
|
|
33
33
|
} | {
|
|
34
34
|
ok: false;
|
|
35
|
+
/** For a log. What a person reads is `expired`'s, in the action endpoint. */
|
|
35
36
|
error: string;
|
|
37
|
+
/** True when the token was sound and is only too old: the one failure worth telling apart. */
|
|
38
|
+
expired?: boolean;
|
|
36
39
|
};
|
|
37
40
|
/**
|
|
38
41
|
* Verifies a base64url-encoded action token with constant-time signature
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/approvals/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;AAE7E,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAA;CACjB;AA2BD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAChC;
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/approvals/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,MAAM,MAAM,iBAAiB,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,SAAS,CAAA;AAE7E,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,iBAAiB,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,uDAAuD;IACvD,QAAQ,EAAE,MAAM,CAAA;CACjB;AA2BD;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAKjB;AAED,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,kEAAkE;IAClE,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,WAAW,CAAA;CAAE,GAChC;IACE,EAAE,EAAE,KAAK,CAAA;IACT,6EAA6E;IAC7E,KAAK,EAAE,MAAM,CAAA;IACb,8FAA8F;IAC9F,OAAO,CAAC,EAAE,OAAO,CAAA;CAClB,CAAA;AAEL;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,YAAY,CAAC,CAiDvB;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAGvE"}
|
package/dist/approvals/tokens.js
CHANGED
|
@@ -75,7 +75,7 @@ export async function verifyActionToken(encoded, secret, options = {}) {
|
|
|
75
75
|
const maxAge = options.maxAgeMs ?? DEFAULT_MAX_AGE_MS;
|
|
76
76
|
const now = options.now ?? Date.now();
|
|
77
77
|
if (now - issuedAt > maxAge) {
|
|
78
|
-
return { ok: false, error: 'Token has expired' };
|
|
78
|
+
return { ok: false, error: 'Token has expired', expired: true };
|
|
79
79
|
}
|
|
80
80
|
return {
|
|
81
81
|
ok: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/approvals/tokens.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAYH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,kBAAkB,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAC9C,MAAM,WAAW,GAAG,CAAC,CAAA;AACrB,MAAM,aAAa,GAAG,IAAI,GAAG,CAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;AAC9F,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAA;AAEjC;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,KAAkB,EAClB,MAAc;IAEd,qBAAqB,CAAC,KAAK,CAAC,CAAA;IAC5B,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAA;IAC3F,MAAM,SAAS,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;IACpD,OAAO,eAAe,CAAC,GAAG,OAAO,IAAI,SAAS,EAAE,CAAC,CAAA;AACnD,CAAC;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/approvals/tokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/authoring/tools.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,OAAO,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAgB3D,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAA;IAC3C,OAAO,EAAE,OAAO,CAAA;IAChB,gFAAgF;IAChF,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,+DAA+D;IAC/D,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,6EAA6E;IAC7E,cAAc,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzD,mEAAmE;IACnE,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAA;IAC7C,0GAA0G;IAC1G,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,0FAA0F;IAC1F,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAE9D;AAED,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAErC,+EAA+E;AAC/E,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,MAAM,CAAC,CAMjB;
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/authoring/tools.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAkB,OAAO,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAA;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAA;AAgB3D,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,KAAK,EAAE,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAA;IAC3C,OAAO,EAAE,OAAO,CAAA;IAChB,gFAAgF;IAChF,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,+DAA+D;IAC/D,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;IACxB,6EAA6E;IAC7E,cAAc,EAAE,SAAS;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzD,mEAAmE;IACnE,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,OAAO,CAAA;IAC7C,0GAA0G;IAC1G,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,0FAA0F;IAC1F,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAID,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAE9D;AAED,KAAK,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAErC,+EAA+E;AAC/E,wBAAsB,QAAQ,CAC5B,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAC7B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,MAAM,CAAC,CAMjB;AA4eD,mDAAmD;AACnD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,aAAa,GAAG,iBAAiB,EAAE,CAW7E"}
|
package/dist/authoring/tools.js
CHANGED
|
@@ -191,7 +191,12 @@ function checkTool(deps) {
|
|
|
191
191
|
pendingApproval: pending,
|
|
192
192
|
next: 'An approval request is already pending; it goes live once an approver grants it. Do not request another.',
|
|
193
193
|
}
|
|
194
|
-
:
|
|
194
|
+
: {
|
|
195
|
+
...status,
|
|
196
|
+
// The block's own suggestion is written for an editor in the
|
|
197
|
+
// admin; this is the same advice in this surface's terms.
|
|
198
|
+
next: 'This needs approval before it can go live. Call publish with action "request_approval" to ask for it.',
|
|
199
|
+
};
|
|
195
200
|
},
|
|
196
201
|
};
|
|
197
202
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/authoring/tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/authoring/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-composition.d.ts","sourceRoot":"","sources":["../../../src/components/tools/validate-composition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAI3D,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,cAAc,CAAA;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,oFAAoF;IACpF,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,uBAAuB,GAAG,iBAAiB,
|
|
1
|
+
{"version":3,"file":"validate-composition.d.ts","sourceRoot":"","sources":["../../../src/components/tools/validate-composition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAGxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAI3D,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,cAAc,CAAA;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,oFAAoF;IACpF,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,uBAAuB,GAAG,iBAAiB,CAmC9F"}
|
|
@@ -18,7 +18,10 @@ export function createValidateCompositionTool(deps) {
|
|
|
18
18
|
handler: async (input, ctx) => {
|
|
19
19
|
const manifest = await deps.loader.get();
|
|
20
20
|
const blocks = input.blocks.map((block) => block.type === deps.composedBlockType ? { type: block.type, composed: true } : block);
|
|
21
|
-
|
|
21
|
+
// Contract names, not display labels: the caller named the blocks by
|
|
22
|
+
// their types, and a message naming them differently is a second
|
|
23
|
+
// vocabulary to map back.
|
|
24
|
+
const result = validateComposition({ blocks, label: (type) => type }, manifest);
|
|
22
25
|
await deps.auditWriter({
|
|
23
26
|
...auditContext(ctx, input._meta),
|
|
24
27
|
action: 'design.validate',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-composition.js","sourceRoot":"","sources":["../../../src/components/tools/validate-composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AASnD,MAAM,UAAU,6BAA6B,CAAC,IAA6B;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC;QAC3B,MAAM,EAAE,CAAC;aACN,KAAK,CACJ,CAAC,CAAC,MAAM,CAAC;YACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC/B,CAAC,CACH;aACA,GAAG,CAAC,CAAC,CAAC;KACV,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,gBAAgB,CAAC,mBAAmB;QACvC,WAAW;QACX,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;YACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAqD,EAAE,EAAE,CACxF,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CACrF,CAAA;YACD,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"validate-composition.js","sourceRoot":"","sources":["../../../src/components/tools/validate-composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAGvB,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AACzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AASnD,MAAM,UAAU,6BAA6B,CAAC,IAA6B;IACzE,MAAM,WAAW,GAAG,QAAQ,CAAC;QAC3B,MAAM,EAAE,CAAC;aACN,KAAK,CACJ,CAAC,CAAC,MAAM,CAAC;YACP,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;YAChB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;SAC/B,CAAC,CACH;aACA,GAAG,CAAC,CAAC,CAAC;KACV,CAAC,CAAA;IAEF,OAAO;QACL,GAAG,gBAAgB,CAAC,mBAAmB;QACvC,WAAW;QACX,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YAC5B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAA;YACxC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAqD,EAAE,EAAE,CACxF,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,CACrF,CAAA;YACD,qEAAqE;YACrE,iEAAiE;YACjE,0BAA0B;YAC1B,MAAM,MAAM,GAAG,mBAAmB,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAA;YAE/E,MAAM,IAAI,CAAC,WAAW,CAAC;gBACrB,GAAG,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC;gBACjC,MAAM,EAAE,iBAAiB;gBACzB,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE,sBAAsB;aAChC,CAAC,CAAA;YAEF,OAAO,MAAM,CAAA;QACf,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type LoadedManifest } from '@forumone/throughline-design-system/contract';
|
|
2
2
|
export interface CompositionBlock {
|
|
3
3
|
type: string;
|
|
4
4
|
variant?: string;
|
|
@@ -11,6 +11,14 @@ export interface CompositionBlock {
|
|
|
11
11
|
}
|
|
12
12
|
export interface CompositionInput {
|
|
13
13
|
blocks: CompositionBlock[];
|
|
14
|
+
/**
|
|
15
|
+
* What to call a component in a message. The publish step passes each
|
|
16
|
+
* block's own label — what the editor picked it by, `Image Hero` — and an
|
|
17
|
+
* MCP caller, who speaks in contract names, may pass the name itself.
|
|
18
|
+
* Defaults to the name as the generated blocks label it, `ImageHero` →
|
|
19
|
+
* `Image Hero`. forumone-2026#805.
|
|
20
|
+
*/
|
|
21
|
+
label?: ((type: string) => string) | undefined;
|
|
14
22
|
}
|
|
15
23
|
export interface CompositionIssue {
|
|
16
24
|
severity: 'error' | 'warning';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../../src/components/validation/composition.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"composition.d.ts","sourceRoot":"","sources":["../../../src/components/validation/composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,8CAA8C,CAAA;AAErD,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,gBAAgB,EAAE,CAAA;IAC1B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CAC/C;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAA;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,gBAAgB,EAAE,CAAA;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC/B,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,cAAc,GACvB,iBAAiB,CA+FnB;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,gBAAgB,EACvB,QAAQ,EAAE,cAAc,GACvB,gBAAgB,EAAE,CAmDpB"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { componentDisplayName, } from '@forumone/throughline-design-system/contract';
|
|
1
2
|
/**
|
|
2
3
|
* Validates a proposed page layout against the design system's composition
|
|
3
4
|
* rules: forbiddenAdjacent, maxPerPage, requiredSiblings, unknown components,
|
|
@@ -6,6 +7,7 @@
|
|
|
6
7
|
export function validateComposition(input, manifest) {
|
|
7
8
|
const issues = [];
|
|
8
9
|
const counts = new Map();
|
|
10
|
+
const label = input.label ?? componentDisplayName;
|
|
9
11
|
for (let i = 0; i < input.blocks.length; i++) {
|
|
10
12
|
const block = input.blocks[i];
|
|
11
13
|
if (!block || block.composed)
|
|
@@ -16,7 +18,7 @@ export function validateComposition(input, manifest) {
|
|
|
16
18
|
issues.push({
|
|
17
19
|
severity: 'error',
|
|
18
20
|
rule: 'unknown-component',
|
|
19
|
-
message: `
|
|
21
|
+
message: `This block is a type this site no longer has ("${block.type}"). Remove it, or tell a site administrator.`,
|
|
20
22
|
blockIndex: i,
|
|
21
23
|
});
|
|
22
24
|
continue;
|
|
@@ -31,7 +33,7 @@ export function validateComposition(input, manifest) {
|
|
|
31
33
|
issues.push({
|
|
32
34
|
severity: 'error',
|
|
33
35
|
rule: 'placement',
|
|
34
|
-
message:
|
|
36
|
+
message: `${label(block.type)} belongs inside another block, not on the page by itself. Remove it, or add it inside a block that holds it.`,
|
|
35
37
|
blockIndex: i,
|
|
36
38
|
});
|
|
37
39
|
}
|
|
@@ -41,7 +43,7 @@ export function validateComposition(input, manifest) {
|
|
|
41
43
|
issues.push({
|
|
42
44
|
severity: 'error',
|
|
43
45
|
rule: 'unknown-variant',
|
|
44
|
-
message: `
|
|
46
|
+
message: `The "${block.variant}" style isn't available for ${label(block.type)} any more. Choose another style in the block.`,
|
|
45
47
|
blockIndex: i,
|
|
46
48
|
});
|
|
47
49
|
}
|
|
@@ -53,7 +55,7 @@ export function validateComposition(input, manifest) {
|
|
|
53
55
|
issues.push({
|
|
54
56
|
severity: 'error',
|
|
55
57
|
rule: 'forbidden-adjacent',
|
|
56
|
-
message:
|
|
58
|
+
message: `${label(block.type)} can't come directly after ${label(forbidden)}. Move one of them, or put another block between them.`,
|
|
57
59
|
blockIndex: i,
|
|
58
60
|
});
|
|
59
61
|
}
|
|
@@ -61,7 +63,7 @@ export function validateComposition(input, manifest) {
|
|
|
61
63
|
issues.push({
|
|
62
64
|
severity: 'error',
|
|
63
65
|
rule: 'forbidden-adjacent',
|
|
64
|
-
message:
|
|
66
|
+
message: `${label(block.type)} can't come directly before ${label(forbidden)}. Move one of them, or put another block between them.`,
|
|
65
67
|
blockIndex: i,
|
|
66
68
|
});
|
|
67
69
|
}
|
|
@@ -76,7 +78,7 @@ export function validateComposition(input, manifest) {
|
|
|
76
78
|
issues.push({
|
|
77
79
|
severity: 'error',
|
|
78
80
|
rule: 'max-per-page',
|
|
79
|
-
message: `
|
|
81
|
+
message: `A page can have only ${max} ${label(type)} block${max === 1 ? '' : 's'}, and this one has ${count}. Remove ${count - max}.`,
|
|
80
82
|
});
|
|
81
83
|
}
|
|
82
84
|
for (const required of contract.composition.requiredSiblings) {
|
|
@@ -84,7 +86,7 @@ export function validateComposition(input, manifest) {
|
|
|
84
86
|
issues.push({
|
|
85
87
|
severity: 'warning',
|
|
86
88
|
rule: 'required-sibling-missing',
|
|
87
|
-
message:
|
|
89
|
+
message: `${label(type)} works best with a ${label(required)} block on the same page, and this page has none.`,
|
|
88
90
|
});
|
|
89
91
|
}
|
|
90
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"composition.js","sourceRoot":"","sources":["../../../src/components/validation/composition.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"composition.js","sourceRoot":"","sources":["../../../src/components/validation/composition.ts"],"names":[],"mappings":"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"}
|
package/dist/exports/client.d.ts
CHANGED
|
@@ -12,6 +12,9 @@ export { UnpublishButton } from '../publishing/admin/UnpublishButton.js';
|
|
|
12
12
|
export type { ThroughlineUnpublishButtonProps } from '../publishing/admin/UnpublishButton.js';
|
|
13
13
|
export { SchedulePublishField } from '../publishing/admin/SchedulePublishField.js';
|
|
14
14
|
export type { ThroughlineSchedulePublishFieldProps } from '../publishing/admin/SchedulePublishField.js';
|
|
15
|
+
export { FirstErrorProvider } from '../publishing/admin/FirstErrorProvider.js';
|
|
16
|
+
export { goToFirstError } from '../publishing/admin/first-error.js';
|
|
17
|
+
export type { GoToFirstErrorOptions } from '../publishing/admin/first-error.js';
|
|
15
18
|
export { callPublishingEndpoint, describeBlock } from '../publishing/admin/publishing-client.js';
|
|
16
19
|
export type { CallPublishingEndpointArgs, PublishingCallResult, PublishingIssue, PublishingResponse, } from '../publishing/admin/publishing-client.js';
|
|
17
20
|
export { CommandPalette } from '../editorial/palette/CommandPalette.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAG7F,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,YAAY,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAA;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,YAAY,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAA;AAE7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAClF,YAAY,EAAE,oCAAoC,EAAE,MAAM,6CAA6C,CAAA;AAEvG,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AAChG,YAAY,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,eAAe,EACf,kBAAkB,GACnB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AACvE,YAAY,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAA;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAChE,YAAY,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAA;AAErF,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,eAAe,EACf,WAAW,GACZ,MAAM,sCAAsC,CAAA;AAC7C,YAAY,EACV,mBAAmB,EACnB,WAAW,EACX,UAAU,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,GAClB,MAAM,sCAAsC,CAAA"}
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAG7F,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AACpE,YAAY,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAA;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AACxE,YAAY,EAAE,+BAA+B,EAAE,MAAM,wCAAwC,CAAA;AAE7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAClF,YAAY,EAAE,oCAAoC,EAAE,MAAM,6CAA6C,CAAA;AAEvG,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AACnE,YAAY,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAE/E,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AAChG,YAAY,EACV,0BAA0B,EAC1B,oBAAoB,EACpB,eAAe,EACf,kBAAkB,GACnB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AACvE,YAAY,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAA;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAA;AAG/D,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAChE,YAAY,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAA;AAErF,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,eAAe,EACf,WAAW,GACZ,MAAM,sCAAsC,CAAA;AAC7C,YAAY,EACV,mBAAmB,EACnB,WAAW,EACX,UAAU,EACV,eAAe,EACf,eAAe,EACf,eAAe,EACf,iBAAiB,GAClB,MAAM,sCAAsC,CAAA"}
|
package/dist/exports/client.js
CHANGED
|
@@ -11,6 +11,8 @@ export { CharacterCountText, CharacterCountTextarea } from '../fields/CharacterC
|
|
|
11
11
|
export { PublishButton } from '../publishing/admin/PublishButton.js';
|
|
12
12
|
export { UnpublishButton } from '../publishing/admin/UnpublishButton.js';
|
|
13
13
|
export { SchedulePublishField } from '../publishing/admin/SchedulePublishField.js';
|
|
14
|
+
export { FirstErrorProvider } from '../publishing/admin/FirstErrorProvider.js';
|
|
15
|
+
export { goToFirstError } from '../publishing/admin/first-error.js';
|
|
14
16
|
export { callPublishingEndpoint, describeBlock } from '../publishing/admin/publishing-client.js';
|
|
15
17
|
// Editorial
|
|
16
18
|
export { CommandPalette } from '../editorial/palette/CommandPalette.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,SAAS;AACT,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAE7F,aAAa;AACb,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAGpE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAGlF,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AAQhG,YAAY;AACZ,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAA;AAE/D,eAAe;AACf,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAGhE,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,eAAe,EACf,WAAW,GACZ,MAAM,sCAAsC,CAAA"}
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,SAAS;AACT,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAA;AAE7F,aAAa;AACb,OAAO,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAA;AAGpE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAA;AAGxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAA;AAGlF,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAA;AAGnE,OAAO,EAAE,sBAAsB,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAA;AAQhG,YAAY;AACZ,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAEvE,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAA;AAE/D,eAAe;AACf,OAAO,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAGhE,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,eAAe,EACf,WAAW,GACZ,MAAM,sCAAsC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slug.d.ts","sourceRoot":"","sources":["../../src/fields/slug.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,cAAc,EACnB,KAAK,KAAK,EACX,MAAM,SAAS,CAAA;AAOhB,4DAA4D;AAC5D,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAW7C;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,KAAK,CAwBlF;AAED,wDAAwD;AACxD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9E;AAED,iDAAiD;AACjD,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAM5D;AAiBD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,cAAc,GAAG,4BAA4B,
|
|
1
|
+
{"version":3,"file":"slug.d.ts","sourceRoot":"","sources":["../../src/fields/slug.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,4BAA4B,EACjC,KAAK,cAAc,EACnB,KAAK,KAAK,EACX,MAAM,SAAS,CAAA;AAOhB,4DAA4D;AAC5D,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAW7C;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,KAAK,CAwBlF;AAED,wDAAwD;AACxD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAG9E;AAED,iDAAiD;AACjD,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAM5D;AAiBD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,cAAc,GAAG,4BAA4B,CA8B9F"}
|
package/dist/fields/slug.js
CHANGED
|
@@ -93,10 +93,13 @@ export function refuseSlugHeldInTrash(collection) {
|
|
|
93
93
|
const holder = docs[0];
|
|
94
94
|
if (!holder)
|
|
95
95
|
return data;
|
|
96
|
+
// `t`, or Payload writes its "The following field is invalid:" prefix in
|
|
97
|
+
// hard-coded English and a host's translation of it never applies.
|
|
96
98
|
throw new ValidationError({
|
|
97
99
|
collection,
|
|
98
100
|
errors: [{ path: 'slug', label: 'Slug', message: heldInTrash(slug, titleOf(holder)) }],
|
|
99
|
-
|
|
101
|
+
req,
|
|
102
|
+
}, req.t);
|
|
100
103
|
};
|
|
101
104
|
}
|
|
102
105
|
//# sourceMappingURL=slug.js.map
|
package/dist/fields/slug.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"slug.js","sourceRoot":"","sources":["../../src/fields/slug.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"slug.js","sourceRoot":"","sources":["../../src/fields/slug.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SyncButton.d.ts","sourceRoot":"","sources":["../../../src/integrations/admin/SyncButton.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"SyncButton.d.ts","sourceRoot":"","sources":["../../../src/integrations/admin/SyncButton.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAmD,MAAM,OAAO,CAAA;AAYvE,MAAM,WAAW,0BAA0B;IACzC,kFAAkF;IAClF,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB;AAQD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,UAAU,CAAC,KAAK,GAAE,0BAA+B,GAAG,KAAK,CAAC,SAAS,CA+HlF"}
|