Repository navigation
feat: typography tokens editor and ds-service typography style operations - #121
Merged
Merged
Conversation
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars.
 |
raininforest
approved these changes
Oct 19, 2026
vkaltyrin
changed the title
vkaltyrin
force-pushed
the
feature/typography-tokens-editor
branch
from
October 21, 2026 09:49
0363097 to
ef0e848
Compare
| /** Поля редакции значения свойства, которые нужны запросу использования. */ | ||
| const val VALUE_FIELDS = "latest.token_id, latest.value" | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
UUID подставляется в SQL строкой. Инъекции нет, потому что значение типизировано, но это расходится с остальным кодом на Exposed. Кроме того, условие v.token_id IS NOT NULL захватывает все токен-ссылки, включая цвета, а отсекает их только LEFT JOIN. Каждый GET и PATCH проходит по всем значениям свойств дизайн-системы.
Contributor
Author
There was a problem hiding this comment.
Исправлено: ссылки через token_id отбираются только на токены типографии, PATCH больше не пересчитывает использование. UUID передаётся параметром с #109.
| .filter { (platform, value) -> value != token.values[platform] } | ||
| return values.takeIf { it.isNotEmpty() }?.let { WrittenTypographyToken(token.id, token.name.toString(), it) } | ||
| } | ||
| } |
Collaborator
There was a problem hiding this comment.
пишет только в платформы, у которых в теме уже есть значение. Если у темы нет значений типографии, ревизия повысится, а записано ничего не будет
Contributor
Author
There was a problem hiding this comment.
Исправлено: если у темы нет значений стиля, PATCH отвечает 409 TYPOGRAPHY_VALUES_MISSING вместо пустого 200. Ревизия при пустой записи и раньше не росла: с #109 редакция создаётся только при записи значения.
| retry: () => session.autosave.retry(), | ||
| fieldError, | ||
| reload: () => load(session), | ||
| }; |
Collaborator
There was a problem hiding this comment.
При конфликте 409 клиент перечитывает стили, но саму модель темы (live.theme) не обновляет. Другие разделы до перезагрузки могут показывать старую типографику
Contributor
Author
There was a problem hiding this comment.
После rebase на #109 конфликта 409 у типографии нет: при правке одного значения побеждает последняя запись. Модель темы обновляется из ответа PATCH, а после чужой правки — перечитыванием по SSE.
neretin-trike
approved these changes
Oct 21, 2026
malilex
force-pushed
the
feature/ds-versions
branch
from
October 22, 2026 12:26
74386d7 to
d143d81
Compare
vkaltyrin
force-pushed
the
feature/typography-tokens-editor
branch
from
October 22, 2026 13:50
fac88ef to
b8dd05f
Compare
angirb
reviewed
Oct 26, 2026
angirb
reviewed
Oct 26, 2026
angirb
reviewed
Oct 26, 2026
angirb
reviewed
Oct 26, 2026
angirb
reviewed
Oct 26, 2026
Typography section by the SDDS Portal prototype: screen sizes, style tree, scale board and style inspector with autosave, plus ds-service operations that read typography styles in px with component usage and update a style across its tokens and platforms.
Keep unsaved draft records on save errors, restrict font weight to steps of 100 and map iOS 100/200 to thin/ultraLight as the existing token parser does.
Read and edit typography styles of a theme (OpenSpec change
add-typography-tokens-editor):
- GET /tenants/{tenantId}/typography-styles returns the styles of
screen-l, screen-m and screen-s in px with variant tokens, the font
families of the design system and the components that use each style;
- PATCH /tenants/{tenantId}/typography-styles/{tokenId} writes size, line
height and letter spacing to the three style tokens of the token screen,
variant weights and the font family to the style on every screen, in the
platform formats of web, android and ios, and checks and increments the
shared theme editRevision.
Values are validated with the prototype messages; weights are limited to
100..900 in steps of 100 and map to iOS words as the token parser does.
Replace the old typography screen with the prototype Typography screen: screen switch, style tree, scale board and inspector with style, variant weights and component usage. Edits are saved by ds-service style operations with the colors autosave queue; typography entries of the old draft can be saved or discarded. The old screen, its add and disable actions and TypographyPicker are removed.
Mark the implemented tasks, name details.field as the location of the invalid field in INVALID_TYPOGRAPHY_VALUE and list the save status in the toolbar among the prototype differences.
Board rows keep the prototype heights, which are tuned for the default theme values, and grow when the letters of the sample (0.75 of the font size plus 8 px) do not fit, so an enlarged style is not cropped.
The prototype board is fixed to the 1440 px window (719 px) and leaves an empty area on wide screens; the board now takes the canvas width and the sample column grows. The single-line sample uses a line height not smaller than the font size, so a style with a short line height is not cropped.
Rebase the typography change onto the versioned multi-user editing model. Style changes write subject revisions of token values with per-value base revisions, report concurrent writes of /value in X-DS-Mutation-Metadata warnings and never answer 409; the theme edit revision is gone from the read and change contracts. Reads take versionId, return technical value revisions and resolve component usage on the same boundary; writes to a published version answer historical_version_read_only. The editor wraps mutations in subjectMutation, takes base revisions from subjectRevisions, reports its queue as the typography autosave source, retries network errors with a growing delay, rereads styles after a remote draft change once local queues are confirmed, opens a style from the journal by tokenId and drops the legacy draft banner.
Read styles, families and values from token_revisions and token_value_revisions on the transaction boundary with versionId support, return the technical revision and stable id of every value, and resolve component usage from the latest revisions of property values, styles and tokens. A style change locks the design system and the style values, rereads them and writes new draft revisions of changed values only, with the /value path and the base revision from the body or X-DS-Base-Revision; the response carries the mutation metadata headers. The theme edit revision, its lock and TENANT_EDIT_CONFLICT are removed. OpenAPI refers to the shared VersionId, OptionalBaseRevision and mutation metadata headers.
Typography mutations go through subjectMutation with base revisions of the style values from subjectRevisions, the queue reports its state as the typography autosave source and retries network and 5xx errors after 1 s doubling up to 30 s. Styles are read with versionId, a published version is read-only, a new theme model from the draft invalidation stream rereads styles after local queues are confirmed, ?tokenId selects the screen and style, and truncated metadata of typography-styles refreshes theme tokens. The legacy draft banner is removed: ThemeEditorSession sends those entries.
…names in typography Address the typography review: - the inspector selects a variant (Regular, Medium or Bold) under the font family and shows one weight field for it, as the prototype has one weight; - the board sample is one line of the style line height and is clipped by it, so reducing the line height is visible; the row grows when the line height is taller than the prototype sample; - the font name column is wider and long names wrap instead of being cut.
The weight of the selected variant takes a full row under the variant picker, like the variant field; size and line height share the next row and letter spacing follows.
The editor header already shows the draft autosave state that the typography queue reports to, so the section keeps no status of its own. A save error is shown as an inspector banner with Retry.
The variant and weight fields sit in a grid with the same 4 px gap as the font family block, so every field in the style section is 12 px apart.
…me values - the usage query keeps only token references to typography tokens instead of every token_id value of the design system (440 of 2589 rows on a copy of the working database, 40-50 ms instead of 140 ms); - PATCH no longer recomputes usage: it does not change with a style edit, and the response style has an empty components list; - an edit of style tokens that have no values in the theme returns 409 TYPOGRAPHY_VALUES_MISSING instead of 200 with nothing written.
The client keeps components of a style from the read when it applies an edit response, and shows 409 TYPOGRAPHY_VALUES_MISSING as a save error with Retry instead of a field error.
A platform field is its own when its value differs from web: the read returns such fields in overrides, PATCH with platform ios or android writes sizes and weights only to that platform, and a web edit no longer overwrites own platform values. Writing the web value back removes the own value. The font family stays shared across platforms.
A + on the weight, size, line height and letter spacing fields picks iOS or Android and adds a '↳ iOS' row under the field; × removes it by writing the web value. Also center the + on the field, keep the weight list chevron aligned in override rows and give tree rows room inside the selection.
Record the own iOS and Android values decision and requirements, and rebaseline javascript-client for them (density 9.26 -> 9.28 by the developer's decision).
Use an SVG glyph instead of the font character, whose plus sits off the line centre, so the sign is centred in its button.
…graphy design system Since #109 landed in dev, component configurations are seeded when the design system is created, so the catalog must be loaded first. The typography HTTP test now uses IsolatedPostgresDatabase, whose schema is migrated before the catalog is loaded.
…-only fields - The group chevron in the typography tree is drawn with CSS like in Palette and Colors; the text glyphs sat below the label. - Variant and weight lists use the same menu as the font family instead of a native select, whose popup each browser draws differently (light text on white in Chrome on Windows). Menu dismissal is shared by the three inspector menus. - Disabled inspector fields are dimmed as a whole in read-only mode; only the family button was dimmed before. The variant stays available: it only picks which variant to show.
…ography editor The branch is rebased onto dev after the design system import/export, the removal of admin and db-service and #132. The javascript-client baseline is recomputed from dev with the typography editor: complexity 4935 at density 9.58 over 51511 lines, status score 48.
vkaltyrin
force-pushed
the
feature/typography-tokens-editor
branch
from
October 26, 2026 11:42
aaf78b0 to
82ce2d1
Compare
…selection - Board samples are drawn with the weight of the variant selected in the inspector; the variant choice moved to the screen and is shared by the inspector and the board. - Board row selection follows the Figma layouts and the Colors swatch cards: no row fill or left bar, the sample gets a grey border on hover and a blue one when selected. - The OpenSpec change records both designer decisions.
…y mode - Board samples are cards with the Figma fill: the same translucent layer as #37393d over #212327, so the contrast with the board matches the layout. - The variant list is disabled in read-only mode like every other field: nothing can be changed in a published version.
angirb
approved these changes
Oct 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Что это
OpenSpec change
add-typography-tokens-editorи его реализация. Change одобрен на ревью в этом PR, реализация перенесена сюда из #125.Раздел «Типографика» переводится на прототип SDDS Portal и на операции
ds-service, как «Палитра» и «Цвета».База —
dev, в котором уже есть #109 (версии, журнал и многопользовательское редактирование), #123, #132, импорт и экспорт дизайн-систем и удаление admin и db-service. Спеки и код приведены к модели #109 отдельными коммитами; ранние коммиты на схеме #109 по отдельности не собираются.Ключевые решения change
screen-l.body.m.normal|medium|boldотличаются только весом. В интерфейсе это один стиль: под семейством выбирается начертание Regular, Medium или Bold, а ниже — его вес.ds-serviceпереводит px и em в формат каждой платформы. На вебеremпри базе 16. На iOS вес словом: 100thin, 200ultraLight.overridden, как в feat(ds): градиент как вид значения цветового токена #122; если feat(ds): градиент как вид значения цветового токена #122 введёт её для всех значений, типографию стоит перевести на неё.ds-service
GET /api/ds/tenants/{tenantId}/typography-styles(с необязательнымversionId) отдаёт:screen-l,screen-m,screen-sв px с токенами начертаний;valueRevisions) вместо общегоeditRevision;overrides): по iOS и Android только поля, которые отличаются от веба.versionIdcanEdit=false, недоступная версия —404.body.m.normal), с экраном и черезtoken_id. Ссылки черезtoken_idотбираются только на токены типографии.PATCH /api/ds/tenants/{tenantId}/typography-styles/{tokenId}пишет предметные редакции изменённых значений в текущую тему одной транзакцией:baseRevisionsпо значению илиX-DS-Base-Revision;warningsзаголовкаX-DS-Mutation-Metadata;409 TENANT_EDIT_CONFLICTнет;versionId—400 historical_version_read_only;platform: "ios" | "android"размеры и веса пишутся только в эту платформу; безplatform— в веб и в платформы, у которых поле не своё. Семейство общее для платформ,platformсfontFamily—400;componentsв ответе пустой.409 TYPOGRAPHY_VALUES_MISSINGвместо пустого200.400 INVALID_TYPOGRAPHY_VALUE, поле передаётся вdetails.field.route-manifest.jsonи OpenAPI.Клиент
modules/typographyTokens:subjectMutationс базовыми редакциями изsubjectRevisions.pages/typography:<select>браузеры рисуют по-разному;409 TYPOGRAPHY_VALUES_MISSING;5xx(1 с с удвоением до 30 с), «Повторить» отправляет сразу;setDraftAutosaveActivity), стили перечитываются по SSE после очереди;?versionId) открывается только для чтения: все поля, включая выбор начертания, недоступны и приглушены; переход из журнала по?tokenIdвыбирает стиль..typography-screen, какcolor-tokens.css.TypographyPicker.Расхождения с прототипом
Полная таблица с причинами — в
design.md. Коротко:Проверки
ds-service.
token_id, имя с экраном и инварианты;После rebase на текущий
devи правок по QA:tools/verify full --change add-typography-tokens-editor— PASS:openspec validate,./gradlew verifyFull, strictacode бэкенда,npm run verify:fullи strictacode JS после пересчёта базовой линии. Красных тестов манифестаdb-serviceбольше нет:db-serviceудалён изdev.tsc,eslint, strictacodejavascript-clientиopenspec validate— PASS.После rebase на
devс feat(ds): версии, журнал изменений и версионная палитра #109 и feat(ds-service): Add component editor model API #123:tools/verify fullпрошёл, кроме двух тестов манифеста маршрутовdb-serviceпроappearance-editor: они были красными и на чистомdev.IsolatedPostgresDatabase: вdevкомпоненты сидятся при создании дизайн-системы, поэтому каталог загружается до неё.До rebase на
dev, наfeature/ds-versions, после правок по ревью:tools/verify full --change add-typography-tokens-editor— PASS, включая strictacode../gradlew build --continueвds-service— PASS (detekt, spotless, тесты). HTTP-тест дополнительно покрывает редакции значений в чтении, устаревшую базу сwarnings:["/value"], обрезку метаданных, публикацию (версия показывает прежние значения, запись в неё —400), журнал и откат.npm run build,npm test(689 тестов в 89 файлах) — PASS;npm run lint— 24 ошибки, все в файлах вне PR, столько же на чистомfeature/ds-versions.openspec validatechange и--specs— PASS на 1.6.0.Базовая линия strictacode
javascript-clientпересчитана отdevпо решению разработчика: сложность 4935, плотность 9.58 (вdev— 4740 и 9.41).До rebase на feat(ds): версии, журнал изменений и версионная палитра #109: тесты домена, очереди, адаптера, переноса черновика, борда и экрана;
tools/verify full— PASS.На локальном контуре с копией рабочей базы (
base_default):screen-l.body.m.*на трёх платформах,screen-mиscreen-sне меняются;ds-serviceиз ветки на копии базы): правки начертания, веса, размера и высоты строки сохраняются, образец обрезается по высоте строки;Не выполнено:
dsbuilder theme fetchс изменёнными значениями;Change будет заархивирован после этих проверок.