Support typed customization tokens and preserve rejected style snapshots

This commit is contained in:
waozi committed 2026-10-09 00:14:04 -03:00
1 parent 751df84d31
commit 8dfb075422
6 files changed
+87 -27

No files matched your search

+1
View File
@@ -1,2 +1,3 @@
build/
ziran.local.toml
backup/
+6
View File
@@ -24,6 +24,12 @@ sheet in steps and install it; `ProvideStyleRulesImport` answers an
classic pack is also compiled in as `style_pack_classic`, so an app can
install it without shipping the `.kss` file.
Customization hosts can use `KssAddTokenOverride` before parsing to override
color, length, duration, or material tokens throughout a pack. A later override
of the same name and kind replaces the earlier value. Names are owned by the
parser; invalid names and exhausted capacity produce diagnostics. Rule
installation validates the new snapshot before replacing existing colors.
## Develop
`ExportCSS(source, path, environment, output)` exports a supplied KSS source
+29 -10
View File
@@ -175,11 +175,6 @@ KssToken :: struct {
column: s32
}
KssColorOverride :: struct {
name: string
color: u32
}
KssOrigin :: struct {
file: s32
line: s32
@@ -253,7 +248,7 @@ KssParser :: struct {
import_depth: s32
tokens: [128]KssToken
token_count: s32
overrides: [64]KssColorOverride
overrides: [128]KssToken
override_count: s32
layer: s32
layer_names: [12]KssName
@@ -338,11 +333,35 @@ KssBeginDeclarative :: (source: string, path: string, env: KssEnvironment) -> Ks
#program_export
KssAddColorOverride :: (p: KssParser, name: string, color: u32) -> KssParser {
if p.override_count < 64 {
p.overrides[p.override_count].name = name
p.overrides[p.override_count].color = color
p.override_count = p.override_count + 1
token: KssToken
token.name = KssMakeName(name)
token.kind = cast(s32)KssTokenColor
token.color = color
return KssAddTokenOverride(p, token)
}
// Customization hosts can override any typed token before parsing a pack.
// Replacing a named override makes precedence explicit and keeps the table
// bounded when user preferences replace a host's theme palette.
#program_export
KssAddTokenOverride :: (p: KssParser, token: KssToken) -> KssParser {
if token.name.length <= 0 || token.name.length > 64 ||
token.kind < cast(s32)KssTokenColor ||
token.kind > cast(s32)KssTokenMaterial {
return KssFail(p, "invalid token override")
}
for index: cast(s32)0..p.override_count - 1 {
if p.overrides[index].kind == token.kind &&
KssNameEqualsName(p.overrides[index].name, token.name) {
p.overrides[index] = token
return p
}
}
if p.override_count >= 128 {
return KssFail(p, "token override capacity exceeded")
}
p.overrides[p.override_count] = token
p.override_count += 1
return p
}
+7 -16
View File
@@ -19,22 +19,13 @@ KssFindToken :: (p: KssParser, name: KssName, kind: s32) -> s32 {
KssApplyOverride :: (p: KssParser, index: s32) -> KssParser {
override: s32 = 0
while override < p.override_count {
if p.tokens[index].kind == cast(s32)KssTokenColor &&
cast(s32)p.overrides[override].name.count == p.tokens[index].name.length {
same: bool = true
byte_index: s32 = 0
while byte_index < p.tokens[index].name.length {
if KssLower(p.overrides[override].name[byte_index]) !=
KssLower(p.tokens[index].name.bytes[byte_index]) {
same = false
}
byte_index = byte_index + 1
}
if same {
p.tokens[index].color = p.overrides[override].color
p.tokens[index].origin = cast(s32)KssOriginVariant
return p
}
if p.tokens[index].kind == p.overrides[override].kind &&
KssNameEqualsName(p.tokens[index].name, p.overrides[override].name) {
p.tokens[index].color = p.overrides[override].color
p.tokens[index].number = p.overrides[override].number
p.tokens[index].material = p.overrides[override].material
p.tokens[index].origin = cast(s32)KssOriginVariant
return p
}
override = override + 1
}
+8 -1
View File
@@ -82,6 +82,13 @@ InstallParsedStyleRules :: (result: StyleRulesParse) -> bool {
}
index += 1
}
// Rule installation owns and validates typeface storage. Publish it before
// changing colors, so a rejected snapshot preserves the entire old theme.
// The validated color table contains at most 128 names of at most 64 bytes;
// after clearing, every color insertion is therefore guaranteed to fit.
if !InstallStyleRules(result.rules) {
return false
}
ClearStyleTokenColors()
index = 0
while index < result.parser.token_count {
@@ -93,5 +100,5 @@ InstallParsedStyleRules :: (result: StyleRulesParse) -> bool {
}
index += 1
}
return InstallStyleRules(result.rules)
return true
}
+36
View File
@@ -1,10 +1,13 @@
#import "kryon/drawing_props"
#import "kryon/style"
#import "kryon/style_sheet"
#import "kryon/control_props"
#import "kss_parser"
#import "style_parse"
using KssStatus;
using KssTokenKind;
using MaterialKind;
InstallBodyTypeface :: (bytes: []u8) -> bool {
rules: StyleRules
@@ -58,6 +61,28 @@ Answer :: () -> s32 {
return 0
}
if !KssCSSNeedsPixels("width") { return 0 }
parsed = BeginStyleRules(
"tokens { length { radius: 4; } material { face: Flat; } } Button { radius: radius; material: face; }",
"custom.kss", KssDefaultEnvironment())
radius: KssToken
radius.name = KssMakeName("radius")
radius.kind = cast(s32)KssTokenLength
radius.number = 12.0
parsed.parser = KssAddTokenOverride(parsed.parser, radius)
radius.number = 24.0
parsed.parser = KssAddTokenOverride(parsed.parser, radius)
face: KssToken
face.name = KssMakeName("face")
face.kind = cast(s32)KssTokenMaterial
face.material = cast(s32)MaterialGlass
parsed.parser = KssAddTokenOverride(parsed.parser, face)
parsed = ParseStyleRules(parsed)
if parsed.parser.status != cast(s32)KssStatusDone ||
parsed.parser.override_count != 2 || parsed.rules.count != 1 ||
parsed.rules.items[0].style.radius != 24.0 ||
cast(s32)parsed.rules.items[0].style.material != cast(s32)MaterialGlass {
return 0
}
parsed = BeginStyleRules(
"@pack colors; tokens { color { canvas: #112233; } }",
"colors.kss", KssDefaultEnvironment())
@@ -82,6 +107,17 @@ Answer :: () -> s32 {
return 0
}
full_rules: StyleRules = StyleRulesAtCapacity(320)
parsed = BeginStyleRules("tokens { color { replacement: #998877; } }",
"invalid-snapshot.kss", KssDefaultEnvironment())
parsed = ParseStyleRules(parsed)
parsed.rules.count = 321
if InstallParsedStyleRules(parsed) {
return 0
}
color = StyleTokenColor("text")
if color.r != 0x44 || color.g != 0x55 || color.b != 0x66 {
return 0
}
parsed = BeginStyleRules("Progress { background: #112233; }",
"full.kss", KssDefaultEnvironment())
parsed.rules = full_rules