An open source design system that's fully customizable and agent ready
TypeScript
feat(native): Swift font tokens group by type style and scale (#8418)
Cindy Zhangc26ae3f7ead1
diff --git a/packages/native/apple/README.md b/packages/native/apple/README.mdindex c59be309a6..d7e315de85 100644--- a/packages/native/apple/README.md+++ b/packages/native/apple/README.md@@ -100,8 +100,10 @@ size.Components read every color, size, and font from the `astryx` environmentvalue, never from a constant of their own. `astryx.tokens` holds the theme'stokens in the current mode as typed members (`tokens.color.textPrimary`,-`tokens.space.s4`, `tokens.font.bodySize`), so a misspelled token fails to-compile. Text sizes grow with Dynamic Type. The components still read some+`tokens.space.s4`, `tokens.font.body.size`), so a misspelled token fails to+compile. Font tokens come grouped: each type style (`tokens.font.body`,+`tokens.font.heading1`) holds its `size`, `weight`, and `leading`, and+`tokens.font.family`, `.size`, and `.weight` hold the scales. Text sizes grow with Dynamic Type. The components still read sometokens by core's name (`astryx.color("color-accent")`); moving them onto thetyped members comes next.diff --git a/packages/native/apple/Sources/Astryx/Heading/Heading.swift b/packages/native/apple/Sources/Astryx/Heading/Heading.swiftindex 59f2e0624c..06b796fb97 100644--- a/packages/native/apple/Sources/Astryx/Heading/Heading.swift+++ b/packages/native/apple/Sources/Astryx/Heading/Heading.swift@@ -68,7 +68,7 @@ public struct Heading: View {func styled(_ text: SwiftUI.Text) -> SwiftUI.Text {var style = typeStyleif let weight = props.weight {- style.weight = astryx.tokens.font.weight(named: weight.rawValue)+ style.weight = astryx.tokens.font.weight.value(named: weight.rawValue)}var text = text.font(astryx.font(style))if let color = astryx.tokens.color.text(named: (props.color ?? .primary).rawValue) {@@ -82,22 +82,22 @@ public struct Heading: View {/// theme's heading family.var typeStyle: TypeStyle {let font = astryx.tokens.font- let (size, weight): (CGFloat, CGFloat) =+ let style: TypeStyleTokens =switch props.type {- case .display1: (font.display1Size, font.display1Weight)- case .display2: (font.display2Size, font.display2Weight)- case .display3: (font.display3Size, font.display3Weight)+ case .display1: font.display1+ case .display2: font.display2+ case .display3: font.display3case nil:switch props.level {- case .v1: (font.heading1Size, font.heading1Weight)- case .v2: (font.heading2Size, font.heading2Weight)- case .v3: (font.heading3Size, font.heading3Weight)- case .v4: (font.heading4Size, font.heading4Weight)- case .v5: (font.heading5Size, font.heading5Weight)- case .v6: (font.heading6Size, font.heading6Weight)+ case .v1: font.heading1+ case .v2: font.heading2+ case .v3: font.heading3+ case .v4: font.heading4+ case .v5: font.heading5+ case .v6: font.heading6}}- return TypeStyle(size: size, weight: weight, families: font.familyHeading)+ return TypeStyle(style, families: font.family.heading)}/// The traits assistive technology gets: a header.diff --git a/packages/native/apple/Sources/Astryx/Text/Text.swift b/packages/native/apple/Sources/Astryx/Text/Text.swiftindex 52852d3d8b..baa28521c4 100644--- a/packages/native/apple/Sources/Astryx/Text/Text.swift+++ b/packages/native/apple/Sources/Astryx/Text/Text.swift@@ -71,17 +71,17 @@ public struct Text: View {let type = props.type ?? .bodyif let style = font.style(type) {var style = style- if let size = props.size { style.size = font.size(size) }- if let weight = props.weight { style.weight = font.weight(named: weight.rawValue) }+ if let size = props.size { style.size = font.size.value(for: size) }+ if let weight = props.weight { style.weight = font.weight.value(named: weight.rawValue) }text = text.font(astryx.font(style))} else if let size = props.size {// `inherit` with a size: SwiftUI cannot change only the size of an// inherited font, so it draws the body family at normal weight (or the// given weight) at that size, a documented gap.- let weight = font.weight(named: props.weight?.rawValue ?? "normal")- text = text.font(astryx.font(TypeStyle(size: font.size(size), weight: weight, families: font.familyBody)))+ let weight = font.weight.value(named: props.weight?.rawValue ?? "normal")+ text = text.font(astryx.font(TypeStyle(size: font.size.value(for: size), weight: weight, families: font.family.body)))} else if let weight = props.weight {- text = text.fontWeight(astryx.fontWeight(font.weight(named: weight.rawValue)))+ text = text.fontWeight(astryx.fontWeight(font.weight.value(named: weight.rawValue)))}if let color = astryx.tokens.color.text(named: (props.color ?? Self.defaultColor(type)).rawValue) {text = text.foregroundStyle(color)diff --git a/packages/native/apple/Sources/Astryx/Text/TypeStyle.swift b/packages/native/apple/Sources/Astryx/Text/TypeStyle.swiftindex d8f8594d2e..a58c8980e3 100644--- a/packages/native/apple/Sources/Astryx/Text/TypeStyle.swift+++ b/packages/native/apple/Sources/Astryx/Text/TypeStyle.swift@@ -8,48 +8,59 @@ struct TypeStyle: Equatable {var families: [String]}+extension TypeStyle {+ /// A theme type style drawn in a family stack.+ init(_ tokens: TypeStyleTokens, families: [String]) {+ self.init(size: tokens.size, weight: tokens.weight, families: families)+ }+}+extension FontTokens {/// The style core's Text draws for a type, or nil for `inherit`. Display/// types draw in the heading family, as core's type scale sets them.func style(_ type: TextType) -> TypeStyle? {switch type {- case .body: TypeStyle(size: bodySize, weight: bodyWeight, families: familyBody)- case .large: TypeStyle(size: largeSize, weight: largeWeight, families: familyBody)- case .label: TypeStyle(size: labelSize, weight: labelWeight, families: familyBody)- case .supporting: TypeStyle(size: supportingSize, weight: supportingWeight, families: familyBody)- case .code: TypeStyle(size: codeSize, weight: codeWeight, families: familyCode)- case .display1: TypeStyle(size: display1Size, weight: display1Weight, families: familyHeading)- case .display2: TypeStyle(size: display2Size, weight: display2Weight, families: familyHeading)- case .display3: TypeStyle(size: display3Size, weight: display3Weight, families: familyHeading)+ case .body: TypeStyle(body, families: family.body)+ case .large: TypeStyle(large, families: family.body)+ case .label: TypeStyle(label, families: family.body)+ case .supporting: TypeStyle(supporting, families: family.body)+ case .code: TypeStyle(code, families: family.code)+ case .display1: TypeStyle(display1, families: family.heading)+ case .display2: TypeStyle(display2, families: family.heading)+ case .display3: TypeStyle(display3, families: family.heading)case .inherit: nil}}+}+extension FontSizeTokens {/// The font size core's Text draws for an explicit `size`. Core spells the/// extra-small size `xsm`; its token is `font-size-xs`.- func size(_ size: TextSize) -> CGFloat {+ func value(for size: TextSize) -> CGFloat {switch size {- case .v4xs: size4xs- case .v3xs: size3xs- case .v2xs: size2xs- case .xsm: sizeXs- case .sm: sizeSm- case .base: sizeBase- case .lg: sizeLg- case .xl: sizeXl- case .v2xl: size2xl- case .v3xl: size3xl- case .v4xl: size4xl+ case .v4xs: s4xs+ case .v3xs: s3xs+ case .v2xs: s2xs+ case .xsm: xs+ case .sm: sm+ case .base: base+ case .lg: lg+ case .xl: xl+ case .v2xl: s2xl+ case .v3xl: s3xl+ case .v4xl: s4xl}}+}+extension FontWeightTokens {/// The numeric weight behind one of core's weight names.- func weight(named name: String) -> CGFloat {+ func value(named name: String) -> CGFloat {switch name {- case "medium": weightMedium- case "semibold": weightSemibold- case "bold": weightBold- default: weightNormal+ case "medium": medium+ case "semibold": semibold+ case "bold": bold+ default: normal}}}diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/ButterTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/ButterTheme.swiftindex 2919a0d8d9..8c90e73458 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/ButterTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/ButterTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 32),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.283,- display1Size: 53,- display1Weight: 400,- display2Leading: 1.2093,- display2Size: 43,- display2Weight: 400,- display3Leading: 1.2941,- display3Size: 34,- display3Weight: 400,- familyBody: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 27,- heading1Weight: 600,- heading2Leading: 1.4545,- heading2Size: 22,- heading2Weight: 600,- heading3Leading: 1.5556,- heading3Size: 18,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.4545,- heading5Size: 11,- heading5Weight: 600,- heading6Leading: 1.7778,- heading6Size: 9,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.5556,- largeSize: 18,- largeWeight: 600,- size2xl: 27,- size2xs: 7,- size3xl: 34,- size3xs: 6,- size4xl: 43,- size4xs: 5,- size5xl: 53,- sizeBase: 14,- sizeLg: 18,- sizeSm: 11,- sizeXl: 22,- sizeXs: 9,- supportingLeading: 1.4545,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 53, weight: 400, leading: 1.283),+ display2: TypeStyleTokens(size: 43, weight: 400, leading: 1.2093),+ display3: TypeStyleTokens(size: 34, weight: 400, leading: 1.2941),+ family: FontFamilyTokens(body: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 27, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 22, weight: 600, leading: 1.4545),+ heading3: TypeStyleTokens(size: 18, weight: 700, leading: 1.5556),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 11, weight: 600, leading: 1.4545),+ heading6: TypeStyleTokens(size: 9, weight: 600, leading: 1.7778),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 18, weight: 600, leading: 1.5556),+ size: FontSizeTokens(base: 14, lg: 18, s2xl: 27, s2xs: 7, s3xl: 34, s3xs: 6, s4xl: 43, s4xs: 5, s5xl: 53, sm: 11, xl: 22, xs: 9),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.4545),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 32),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.283,- display1Size: 53,- display1Weight: 400,- display2Leading: 1.2093,- display2Size: 43,- display2Weight: 400,- display3Leading: 1.2941,- display3Size: 34,- display3Weight: 400,- familyBody: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 27,- heading1Weight: 600,- heading2Leading: 1.4545,- heading2Size: 22,- heading2Weight: 600,- heading3Leading: 1.5556,- heading3Size: 18,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.4545,- heading5Size: 11,- heading5Weight: 600,- heading6Leading: 1.7778,- heading6Size: 9,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.5556,- largeSize: 18,- largeWeight: 600,- size2xl: 27,- size2xs: 7,- size3xl: 34,- size3xs: 6,- size4xl: 43,- size4xs: 5,- size5xl: 53,- sizeBase: 14,- sizeLg: 18,- sizeSm: 11,- sizeXl: 22,- sizeXs: 9,- supportingLeading: 1.4545,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 53, weight: 400, leading: 1.283),+ display2: TypeStyleTokens(size: 43, weight: 400, leading: 1.2093),+ display3: TypeStyleTokens(size: 34, weight: 400, leading: 1.2941),+ family: FontFamilyTokens(body: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Outfit", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 27, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 22, weight: 600, leading: 1.4545),+ heading3: TypeStyleTokens(size: 18, weight: 700, leading: 1.5556),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 11, weight: 600, leading: 1.4545),+ heading6: TypeStyleTokens(size: 9, weight: 600, leading: 1.7778),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 18, weight: 600, leading: 1.5556),+ size: FontSizeTokens(base: 14, lg: 18, s2xl: 27, s2xs: 7, s3xl: 34, s3xs: 6, s4xl: 43, s4xs: 5, s5xl: 53, sm: 11, xl: 22, xs: 9),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.4545),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/ChocolateTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/ChocolateTheme.swiftindex 207f91fc50..95db11faa2 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/ChocolateTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/ChocolateTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.3793,- display3Size: 29,- display3Weight: 400,- familyBody: ["Albert Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Fraunces", "Georgia", "Times New Roman", "Times", "serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.3793),+ family: FontFamilyTokens(body: ["Albert Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Fraunces", "Georgia", "Times New Roman", "Times", "serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 700, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.3793,- display3Size: 29,- display3Weight: 400,- familyBody: ["Albert Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Fraunces", "Georgia", "Times New Roman", "Times", "serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.3793),+ family: FontFamilyTokens(body: ["Albert Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Fraunces", "Georgia", "Times New Roman", "Times", "serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 700, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/DefaultTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/DefaultTheme.swiftindex 1565979e47..8291cde0bb 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/DefaultTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/DefaultTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.2414,- display3Size: 29,- display3Weight: 400,- familyBody: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 600,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 600,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.2414),+ family: FontFamilyTokens(body: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["SF Mono", "Monaco", "Consolas", "monospace"], heading: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 600, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.2414,- display3Size: 29,- display3Weight: 400,- familyBody: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 600,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 600,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.2414),+ family: FontFamilyTokens(body: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["SF Mono", "Monaco", "Consolas", "monospace"], heading: ["-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 600, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/GothicTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/GothicTheme.swiftindex 6f21268110..c8ed0fead5 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/GothicTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/GothicTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 700,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 700,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 13,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 700, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 700, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 13, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 700,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 700,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 13,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Fustat", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 700, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 700, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 13, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/MatchaTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/MatchaTheme.swiftindex 46768aad37..9fc6fa079a 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/MatchaTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/MatchaTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 36),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["DM Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Playwrite US Trad", "Georgia", "Times New Roman", "Times", "serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 600,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 600,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 13,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["DM Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Playwrite US Trad", "Georgia", "Times New Roman", "Times", "serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 600, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 13, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 36),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["DM Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Playwrite US Trad", "Georgia", "Times New Roman", "Times", "serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 600,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 600,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 13,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["DM Sans", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Playwrite US Trad", "Georgia", "Times New Roman", "Times", "serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 600, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 13, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/NeutralTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/NeutralTheme.swiftindex 1ca995c0bf..c07ddbf90d 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/NeutralTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/NeutralTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.3793,- display3Size: 29,- display3Weight: 400,- familyBody: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["ui-monospace", "SF Mono", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"],- familyHeading: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.3793),+ family: FontFamilyTokens(body: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["ui-monospace", "SF Mono", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"], heading: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 700, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.2381,- display1Size: 42,- display1Weight: 400,- display2Leading: 1.2571,- display2Size: 35,- display2Weight: 400,- display3Leading: 1.3793,- display3Size: 29,- display3Weight: 400,- familyBody: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["ui-monospace", "SF Mono", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"],- familyHeading: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 24,- heading1Weight: 600,- heading2Leading: 1.4,- heading2Size: 20,- heading2Weight: 600,- heading3Leading: 1.4118,- heading3Size: 17,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.6667,- heading5Size: 12,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.4118,- largeSize: 17,- largeWeight: 600,- size2xl: 24,- size2xs: 8,- size3xl: 29,- size3xs: 7,- size4xl: 35,- size4xs: 6,- size5xl: 42,- sizeBase: 14,- sizeLg: 17,- sizeSm: 12,- sizeXl: 20,- sizeXs: 10,- supportingLeading: 1.6667,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 42, weight: 400, leading: 1.2381),+ display2: TypeStyleTokens(size: 35, weight: 400, leading: 1.2571),+ display3: TypeStyleTokens(size: 29, weight: 400, leading: 1.3793),+ family: FontFamilyTokens(body: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["ui-monospace", "SF Mono", "Monaco", "Consolas", "Liberation Mono", "Courier New", "monospace"], heading: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 24, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading3: TypeStyleTokens(size: 17, weight: 700, leading: 1.4118),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 12, weight: 600, leading: 1.6667),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 17, weight: 600, leading: 1.4118),+ size: FontSizeTokens(base: 14, lg: 17, s2xl: 24, s2xs: 8, s3xl: 29, s3xs: 7, s4xl: 35, s4xs: 6, s5xl: 42, sm: 12, xl: 20, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.6667),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/StoneTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/StoneTheme.swiftindex e326779fa6..ff58e5f88f 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/StoneTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/StoneTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.283,- display1Size: 53,- display1Weight: 400,- display2Leading: 1.2093,- display2Size: 43,- display2Weight: 400,- display3Leading: 1.2941,- display3Size: 34,- display3Weight: 400,- familyBody: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Montserrat", "Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 27,- heading1Weight: 600,- heading2Leading: 1.4545,- heading2Size: 22,- heading2Weight: 600,- heading3Leading: 1.5556,- heading3Size: 18,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.4545,- heading5Size: 11,- heading5Weight: 600,- heading6Leading: 1.7778,- heading6Size: 9,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.5556,- largeSize: 18,- largeWeight: 600,- size2xl: 27,- size2xs: 7,- size3xl: 34,- size3xs: 6,- size4xl: 43,- size4xs: 5,- size5xl: 53,- sizeBase: 14,- sizeLg: 18,- sizeSm: 11,- sizeXl: 22,- sizeXs: 9,- supportingLeading: 1.4545,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 53, weight: 400, leading: 1.283),+ display2: TypeStyleTokens(size: 43, weight: 400, leading: 1.2093),+ display3: TypeStyleTokens(size: 34, weight: 400, leading: 1.2941),+ family: FontFamilyTokens(body: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Montserrat", "Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 27, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 22, weight: 600, leading: 1.4545),+ heading3: TypeStyleTokens(size: 18, weight: 700, leading: 1.5556),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 11, weight: 600, leading: 1.4545),+ heading6: TypeStyleTokens(size: 9, weight: 600, leading: 1.7778),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 18, weight: 600, leading: 1.5556),+ size: FontSizeTokens(base: 14, lg: 18, s2xl: 27, s2xs: 7, s3xl: 34, s3xs: 6, s4xl: 43, s4xs: 5, s5xl: 53, sm: 11, xl: 22, xs: 9),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.4545),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 28),font: FontTokens(- bodyLeading: 1.4286,- bodySize: 14,- bodyWeight: 400,- codeLeading: 1.4286,- codeSize: 14,- codeWeight: 400,- display1Leading: 1.283,- display1Size: 53,- display1Weight: 400,- display2Leading: 1.2093,- display2Size: 43,- display2Weight: 400,- display3Leading: 1.2941,- display3Size: 34,- display3Weight: 400,- familyBody: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Montserrat", "Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.3333,- heading1Size: 27,- heading1Weight: 600,- heading2Leading: 1.4545,- heading2Size: 22,- heading2Weight: 600,- heading3Leading: 1.5556,- heading3Size: 18,- heading3Weight: 700,- heading4Leading: 1.4286,- heading4Size: 14,- heading4Weight: 700,- heading5Leading: 1.4545,- heading5Size: 11,- heading5Weight: 600,- heading6Leading: 1.7778,- heading6Size: 9,- heading6Weight: 600,- labelLeading: 1.4286,- labelSize: 14,- labelWeight: 500,- largeLeading: 1.5556,- largeSize: 18,- largeWeight: 600,- size2xl: 27,- size2xs: 7,- size3xl: 34,- size3xs: 6,- size4xl: 43,- size4xs: 5,- size5xl: 53,- sizeBase: 14,- sizeLg: 18,- sizeSm: 11,- sizeXl: 22,- sizeXs: 9,- supportingLeading: 1.4545,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ code: TypeStyleTokens(size: 14, weight: 400, leading: 1.4286),+ display1: TypeStyleTokens(size: 53, weight: 400, leading: 1.283),+ display2: TypeStyleTokens(size: 43, weight: 400, leading: 1.2093),+ display3: TypeStyleTokens(size: 34, weight: 400, leading: 1.2941),+ family: FontFamilyTokens(body: ["Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Montserrat", "Figtree", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 27, weight: 600, leading: 1.3333),+ heading2: TypeStyleTokens(size: 22, weight: 600, leading: 1.4545),+ heading3: TypeStyleTokens(size: 18, weight: 700, leading: 1.5556),+ heading4: TypeStyleTokens(size: 14, weight: 700, leading: 1.4286),+ heading5: TypeStyleTokens(size: 11, weight: 600, leading: 1.4545),+ heading6: TypeStyleTokens(size: 9, weight: 600, leading: 1.7778),+ label: TypeStyleTokens(size: 14, weight: 500, leading: 1.4286),+ large: TypeStyleTokens(size: 18, weight: 600, leading: 1.5556),+ size: FontSizeTokens(base: 14, lg: 18, s2xl: 27, s2xs: 7, s3xl: 34, s3xs: 6, s4xl: 43, s4xs: 5, s5xl: 53, sm: 11, xl: 22, xs: 9),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.4545),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/Tokens.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/Tokens.swiftindex 52c829091c..22bb40feb5 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/Tokens.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/Tokens.swift@@ -991,330 +991,272 @@ public struct SizeTokens: Equatable, Sendable {}}-/// The theme's `font` tokens, one typed member per token.+/// The theme's `font` tokens, grouped by kind: each type style's size,+/// weight and leading, and the family, size and weight scales.public struct FontTokens: Equatable, Sendable {- /// `--text-body-leading`- public var bodyLeading: CGFloat- /// `--text-body-size`- public var bodySize: CGFloat- /// `--text-body-weight`- public var bodyWeight: CGFloat- /// `--text-code-leading`- public var codeLeading: CGFloat- /// `--text-code-size`- public var codeSize: CGFloat- /// `--text-code-weight`- public var codeWeight: CGFloat- /// `--text-display-1-leading`- public var display1Leading: CGFloat- /// `--text-display-1-size`- public var display1Size: CGFloat- /// `--text-display-1-weight`- public var display1Weight: CGFloat- /// `--text-display-2-leading`- public var display2Leading: CGFloat- /// `--text-display-2-size`- public var display2Size: CGFloat- /// `--text-display-2-weight`- public var display2Weight: CGFloat- /// `--text-display-3-leading`- public var display3Leading: CGFloat- /// `--text-display-3-size`- public var display3Size: CGFloat- /// `--text-display-3-weight`- public var display3Weight: CGFloat+ /// `--text-body-*`+ public var body: TypeStyleTokens+ /// `--text-code-*`+ public var code: TypeStyleTokens+ /// `--text-display-1-*`+ public var display1: TypeStyleTokens+ /// `--text-display-2-*`+ public var display2: TypeStyleTokens+ /// `--text-display-3-*`+ public var display3: TypeStyleTokens+ /// `--font-family-*`+ public var family: FontFamilyTokens+ /// `--text-heading-1-*`+ public var heading1: TypeStyleTokens+ /// `--text-heading-2-*`+ public var heading2: TypeStyleTokens+ /// `--text-heading-3-*`+ public var heading3: TypeStyleTokens+ /// `--text-heading-4-*`+ public var heading4: TypeStyleTokens+ /// `--text-heading-5-*`+ public var heading5: TypeStyleTokens+ /// `--text-heading-6-*`+ public var heading6: TypeStyleTokens+ /// `--text-label-*`+ public var label: TypeStyleTokens+ /// `--text-large-*`+ public var large: TypeStyleTokens+ /// `--font-size-*`+ public var size: FontSizeTokens+ /// `--text-supporting-*`+ public var supporting: TypeStyleTokens+ /// `--font-weight-*`+ public var weight: FontWeightTokens++ public init(+ body: TypeStyleTokens,+ code: TypeStyleTokens,+ display1: TypeStyleTokens,+ display2: TypeStyleTokens,+ display3: TypeStyleTokens,+ family: FontFamilyTokens,+ heading1: TypeStyleTokens,+ heading2: TypeStyleTokens,+ heading3: TypeStyleTokens,+ heading4: TypeStyleTokens,+ heading5: TypeStyleTokens,+ heading6: TypeStyleTokens,+ label: TypeStyleTokens,+ large: TypeStyleTokens,+ size: FontSizeTokens,+ supporting: TypeStyleTokens,+ weight: FontWeightTokens+ ) {+ self.body = body+ self.code = code+ self.display1 = display1+ self.display2 = display2+ self.display3 = display3+ self.family = family+ self.heading1 = heading1+ self.heading2 = heading2+ self.heading3 = heading3+ self.heading4 = heading4+ self.heading5 = heading5+ self.heading6 = heading6+ self.label = label+ self.large = large+ self.size = size+ self.supporting = supporting+ self.weight = weight+ }++ /// A size, weight, or line-height token by its CSS name, for code that+ /// only has the name. Components read the typed members instead.+ func number(named token: String) -> CGFloat? {+ switch token {+ case "text-body-leading": body.leading+ case "text-body-size": body.size+ case "text-body-weight": body.weight+ case "text-code-leading": code.leading+ case "text-code-size": code.size+ case "text-code-weight": code.weight+ case "text-display-1-leading": display1.leading+ case "text-display-1-size": display1.size+ case "text-display-1-weight": display1.weight+ case "text-display-2-leading": display2.leading+ case "text-display-2-size": display2.size+ case "text-display-2-weight": display2.weight+ case "text-display-3-leading": display3.leading+ case "text-display-3-size": display3.size+ case "text-display-3-weight": display3.weight+ case "text-heading-1-leading": heading1.leading+ case "text-heading-1-size": heading1.size+ case "text-heading-1-weight": heading1.weight+ case "text-heading-2-leading": heading2.leading+ case "text-heading-2-size": heading2.size+ case "text-heading-2-weight": heading2.weight+ case "text-heading-3-leading": heading3.leading+ case "text-heading-3-size": heading3.size+ case "text-heading-3-weight": heading3.weight+ case "text-heading-4-leading": heading4.leading+ case "text-heading-4-size": heading4.size+ case "text-heading-4-weight": heading4.weight+ case "text-heading-5-leading": heading5.leading+ case "text-heading-5-size": heading5.size+ case "text-heading-5-weight": heading5.weight+ case "text-heading-6-leading": heading6.leading+ case "text-heading-6-size": heading6.size+ case "text-heading-6-weight": heading6.weight+ case "text-label-leading": label.leading+ case "text-label-size": label.size+ case "text-label-weight": label.weight+ case "text-large-leading": large.leading+ case "text-large-size": large.size+ case "text-large-weight": large.weight+ case "font-size-base": size.base+ case "font-size-lg": size.lg+ case "font-size-2xl": size.s2xl+ case "font-size-2xs": size.s2xs+ case "font-size-3xl": size.s3xl+ case "font-size-3xs": size.s3xs+ case "font-size-4xl": size.s4xl+ case "font-size-4xs": size.s4xs+ case "font-size-5xl": size.s5xl+ case "font-size-sm": size.sm+ case "font-size-xl": size.xl+ case "font-size-xs": size.xs+ case "text-supporting-leading": supporting.leading+ case "text-supporting-size": supporting.size+ case "text-supporting-weight": supporting.weight+ case "font-weight-bold": weight.bold+ case "font-weight-medium": weight.medium+ case "font-weight-normal": weight.normal+ case "font-weight-semibold": weight.semibold+ default: nil+ }+ }++ /// A font family token by its CSS name, for code that only has the name.+ func families(named token: String) -> [String]? {+ switch token {+ case "font-family-body": family.body+ case "font-family-code": family.code+ case "font-family-heading": family.heading+ default: nil+ }+ }+}++/// One type style: its font size, numeric weight, and line height.+public struct TypeStyleTokens: Equatable, Sendable {+ public var size: CGFloat+ public var weight: CGFloat+ public var leading: CGFloat++ public init(+ size: CGFloat,+ weight: CGFloat,+ leading: CGFloat+ ) {+ self.size = size+ self.weight = weight+ self.leading = leading+ }+}++/// The theme's `font-family` tokens.+public struct FontFamilyTokens: Equatable, Sendable {/// `--font-family-body`- public var familyBody: [String]+ public var body: [String]/// `--font-family-code`- public var familyCode: [String]+ public var code: [String]/// `--font-family-heading`- public var familyHeading: [String]- /// `--text-heading-1-leading`- public var heading1Leading: CGFloat- /// `--text-heading-1-size`- public var heading1Size: CGFloat- /// `--text-heading-1-weight`- public var heading1Weight: CGFloat- /// `--text-heading-2-leading`- public var heading2Leading: CGFloat- /// `--text-heading-2-size`- public var heading2Size: CGFloat- /// `--text-heading-2-weight`- public var heading2Weight: CGFloat- /// `--text-heading-3-leading`- public var heading3Leading: CGFloat- /// `--text-heading-3-size`- public var heading3Size: CGFloat- /// `--text-heading-3-weight`- public var heading3Weight: CGFloat- /// `--text-heading-4-leading`- public var heading4Leading: CGFloat- /// `--text-heading-4-size`- public var heading4Size: CGFloat- /// `--text-heading-4-weight`- public var heading4Weight: CGFloat- /// `--text-heading-5-leading`- public var heading5Leading: CGFloat- /// `--text-heading-5-size`- public var heading5Size: CGFloat- /// `--text-heading-5-weight`- public var heading5Weight: CGFloat- /// `--text-heading-6-leading`- public var heading6Leading: CGFloat- /// `--text-heading-6-size`- public var heading6Size: CGFloat- /// `--text-heading-6-weight`- public var heading6Weight: CGFloat- /// `--text-label-leading`- public var labelLeading: CGFloat- /// `--text-label-size`- public var labelSize: CGFloat- /// `--text-label-weight`- public var labelWeight: CGFloat- /// `--text-large-leading`- public var largeLeading: CGFloat- /// `--text-large-size`- public var largeSize: CGFloat- /// `--text-large-weight`- public var largeWeight: CGFloat+ public var heading: [String]++ public init(+ body: [String],+ code: [String],+ heading: [String]+ ) {+ self.body = body+ self.code = code+ self.heading = heading+ }+}++/// The theme's `font-size` tokens.+public struct FontSizeTokens: Equatable, Sendable {+ /// `--font-size-base`+ public var base: CGFloat+ /// `--font-size-lg`+ public var lg: CGFloat/// `--font-size-2xl`- public var size2xl: CGFloat+ public var s2xl: CGFloat/// `--font-size-2xs`- public var size2xs: CGFloat+ public var s2xs: CGFloat/// `--font-size-3xl`- public var size3xl: CGFloat+ public var s3xl: CGFloat/// `--font-size-3xs`- public var size3xs: CGFloat+ public var s3xs: CGFloat/// `--font-size-4xl`- public var size4xl: CGFloat+ public var s4xl: CGFloat/// `--font-size-4xs`- public var size4xs: CGFloat+ public var s4xs: CGFloat/// `--font-size-5xl`- public var size5xl: CGFloat- /// `--font-size-base`- public var sizeBase: CGFloat- /// `--font-size-lg`- public var sizeLg: CGFloat+ public var s5xl: CGFloat/// `--font-size-sm`- public var sizeSm: CGFloat+ public var sm: CGFloat/// `--font-size-xl`- public var sizeXl: CGFloat+ public var xl: CGFloat/// `--font-size-xs`- public var sizeXs: CGFloat- /// `--text-supporting-leading`- public var supportingLeading: CGFloat- /// `--text-supporting-size`- public var supportingSize: CGFloat- /// `--text-supporting-weight`- public var supportingWeight: CGFloat+ public var xs: CGFloat++ public init(+ base: CGFloat,+ lg: CGFloat,+ s2xl: CGFloat,+ s2xs: CGFloat,+ s3xl: CGFloat,+ s3xs: CGFloat,+ s4xl: CGFloat,+ s4xs: CGFloat,+ s5xl: CGFloat,+ sm: CGFloat,+ xl: CGFloat,+ xs: CGFloat+ ) {+ self.base = base+ self.lg = lg+ self.s2xl = s2xl+ self.s2xs = s2xs+ self.s3xl = s3xl+ self.s3xs = s3xs+ self.s4xl = s4xl+ self.s4xs = s4xs+ self.s5xl = s5xl+ self.sm = sm+ self.xl = xl+ self.xs = xs+ }+}++/// The theme's `font-weight` tokens.+public struct FontWeightTokens: Equatable, Sendable {/// `--font-weight-bold`- public var weightBold: CGFloat+ public var bold: CGFloat/// `--font-weight-medium`- public var weightMedium: CGFloat+ public var medium: CGFloat/// `--font-weight-normal`- public var weightNormal: CGFloat+ public var normal: CGFloat/// `--font-weight-semibold`- public var weightSemibold: CGFloat+ public var semibold: CGFloatpublic init(- bodyLeading: CGFloat,- bodySize: CGFloat,- bodyWeight: CGFloat,- codeLeading: CGFloat,- codeSize: CGFloat,- codeWeight: CGFloat,- display1Leading: CGFloat,- display1Size: CGFloat,- display1Weight: CGFloat,- display2Leading: CGFloat,- display2Size: CGFloat,- display2Weight: CGFloat,- display3Leading: CGFloat,- display3Size: CGFloat,- display3Weight: CGFloat,- familyBody: [String],- familyCode: [String],- familyHeading: [String],- heading1Leading: CGFloat,- heading1Size: CGFloat,- heading1Weight: CGFloat,- heading2Leading: CGFloat,- heading2Size: CGFloat,- heading2Weight: CGFloat,- heading3Leading: CGFloat,- heading3Size: CGFloat,- heading3Weight: CGFloat,- heading4Leading: CGFloat,- heading4Size: CGFloat,- heading4Weight: CGFloat,- heading5Leading: CGFloat,- heading5Size: CGFloat,- heading5Weight: CGFloat,- heading6Leading: CGFloat,- heading6Size: CGFloat,- heading6Weight: CGFloat,- labelLeading: CGFloat,- labelSize: CGFloat,- labelWeight: CGFloat,- largeLeading: CGFloat,- largeSize: CGFloat,- largeWeight: CGFloat,- size2xl: CGFloat,- size2xs: CGFloat,- size3xl: CGFloat,- size3xs: CGFloat,- size4xl: CGFloat,- size4xs: CGFloat,- size5xl: CGFloat,- sizeBase: CGFloat,- sizeLg: CGFloat,- sizeSm: CGFloat,- sizeXl: CGFloat,- sizeXs: CGFloat,- supportingLeading: CGFloat,- supportingSize: CGFloat,- supportingWeight: CGFloat,- weightBold: CGFloat,- weightMedium: CGFloat,- weightNormal: CGFloat,- weightSemibold: CGFloat+ bold: CGFloat,+ medium: CGFloat,+ normal: CGFloat,+ semibold: CGFloat) {- self.bodyLeading = bodyLeading- self.bodySize = bodySize- self.bodyWeight = bodyWeight- self.codeLeading = codeLeading- self.codeSize = codeSize- self.codeWeight = codeWeight- self.display1Leading = display1Leading- self.display1Size = display1Size- self.display1Weight = display1Weight- self.display2Leading = display2Leading- self.display2Size = display2Size- self.display2Weight = display2Weight- self.display3Leading = display3Leading- self.display3Size = display3Size- self.display3Weight = display3Weight- self.familyBody = familyBody- self.familyCode = familyCode- self.familyHeading = familyHeading- self.heading1Leading = heading1Leading- self.heading1Size = heading1Size- self.heading1Weight = heading1Weight- self.heading2Leading = heading2Leading- self.heading2Size = heading2Size- self.heading2Weight = heading2Weight- self.heading3Leading = heading3Leading- self.heading3Size = heading3Size- self.heading3Weight = heading3Weight- self.heading4Leading = heading4Leading- self.heading4Size = heading4Size- self.heading4Weight = heading4Weight- self.heading5Leading = heading5Leading- self.heading5Size = heading5Size- self.heading5Weight = heading5Weight- self.heading6Leading = heading6Leading- self.heading6Size = heading6Size- self.heading6Weight = heading6Weight- self.labelLeading = labelLeading- self.labelSize = labelSize- self.labelWeight = labelWeight- self.largeLeading = largeLeading- self.largeSize = largeSize- self.largeWeight = largeWeight- self.size2xl = size2xl- self.size2xs = size2xs- self.size3xl = size3xl- self.size3xs = size3xs- self.size4xl = size4xl- self.size4xs = size4xs- self.size5xl = size5xl- self.sizeBase = sizeBase- self.sizeLg = sizeLg- self.sizeSm = sizeSm- self.sizeXl = sizeXl- self.sizeXs = sizeXs- self.supportingLeading = supportingLeading- self.supportingSize = supportingSize- self.supportingWeight = supportingWeight- self.weightBold = weightBold- self.weightMedium = weightMedium- self.weightNormal = weightNormal- self.weightSemibold = weightSemibold- }-- /// A size, weight, or line-height token by its CSS name, for code that- /// only has the name. Components read the typed members instead.- func number(named token: String) -> CGFloat? {- switch token {- case "text-body-leading": bodyLeading- case "text-body-size": bodySize- case "text-body-weight": bodyWeight- case "text-code-leading": codeLeading- case "text-code-size": codeSize- case "text-code-weight": codeWeight- case "text-display-1-leading": display1Leading- case "text-display-1-size": display1Size- case "text-display-1-weight": display1Weight- case "text-display-2-leading": display2Leading- case "text-display-2-size": display2Size- case "text-display-2-weight": display2Weight- case "text-display-3-leading": display3Leading- case "text-display-3-size": display3Size- case "text-display-3-weight": display3Weight- case "text-heading-1-leading": heading1Leading- case "text-heading-1-size": heading1Size- case "text-heading-1-weight": heading1Weight- case "text-heading-2-leading": heading2Leading- case "text-heading-2-size": heading2Size- case "text-heading-2-weight": heading2Weight- case "text-heading-3-leading": heading3Leading- case "text-heading-3-size": heading3Size- case "text-heading-3-weight": heading3Weight- case "text-heading-4-leading": heading4Leading- case "text-heading-4-size": heading4Size- case "text-heading-4-weight": heading4Weight- case "text-heading-5-leading": heading5Leading- case "text-heading-5-size": heading5Size- case "text-heading-5-weight": heading5Weight- case "text-heading-6-leading": heading6Leading- case "text-heading-6-size": heading6Size- case "text-heading-6-weight": heading6Weight- case "text-label-leading": labelLeading- case "text-label-size": labelSize- case "text-label-weight": labelWeight- case "text-large-leading": largeLeading- case "text-large-size": largeSize- case "text-large-weight": largeWeight- case "font-size-2xl": size2xl- case "font-size-2xs": size2xs- case "font-size-3xl": size3xl- case "font-size-3xs": size3xs- case "font-size-4xl": size4xl- case "font-size-4xs": size4xs- case "font-size-5xl": size5xl- case "font-size-base": sizeBase- case "font-size-lg": sizeLg- case "font-size-sm": sizeSm- case "font-size-xl": sizeXl- case "font-size-xs": sizeXs- case "text-supporting-leading": supportingLeading- case "text-supporting-size": supportingSize- case "text-supporting-weight": supportingWeight- case "font-weight-bold": weightBold- case "font-weight-medium": weightMedium- case "font-weight-normal": weightNormal- case "font-weight-semibold": weightSemibold- default: nil- }- }-- /// A font family token by its CSS name, for code that only has the name.- func families(named token: String) -> [String]? {- switch token {- case "font-family-body": familyBody- case "font-family-code": familyCode- case "font-family-heading": familyHeading- default: nil- }+ self.bold = bold+ self.medium = medium+ self.normal = normal+ self.semibold = semibold}}diff --git a/packages/native/apple/Sources/Astryx/Theme/Generated/Y2kTheme.swift b/packages/native/apple/Sources/Astryx/Theme/Generated/Y2kTheme.swiftindex 3d8167f2b9..7573501a0d 100644--- a/packages/native/apple/Sources/Astryx/Theme/Generated/Y2kTheme.swift+++ b/packages/native/apple/Sources/Astryx/Theme/Generated/Y2kTheme.swift@@ -197,67 +197,23 @@ extension Theme {elementSm: 32),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 600,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 600,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 600, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))),dark: Tokens(@@ -450,67 +406,23 @@ extension Theme {elementSm: 32),font: FontTokens(- bodyLeading: 1.5,- bodySize: 16,- bodyWeight: 400,- codeLeading: 1.5,- codeSize: 16,- codeWeight: 400,- display1Leading: 1.2459,- display1Size: 61,- display1Weight: 400,- display2Leading: 1.2245,- display2Size: 49,- display2Weight: 400,- display3Leading: 1.2308,- display3Size: 39,- display3Weight: 400,- familyBody: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- familyCode: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"],- familyHeading: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"],- heading1Leading: 1.4194,- heading1Size: 31,- heading1Weight: 600,- heading2Leading: 1.44,- heading2Size: 25,- heading2Weight: 600,- heading3Leading: 1.4,- heading3Size: 20,- heading3Weight: 600,- heading4Leading: 1.5,- heading4Size: 16,- heading4Weight: 600,- heading5Leading: 1.5385,- heading5Size: 13,- heading5Weight: 600,- heading6Leading: 1.6,- heading6Size: 10,- heading6Weight: 600,- labelLeading: 1.5,- labelSize: 16,- labelWeight: 500,- largeLeading: 1.4,- largeSize: 20,- largeWeight: 600,- size2xl: 31,- size2xs: 8,- size3xl: 39,- size3xs: 7,- size4xl: 49,- size4xs: 5,- size5xl: 61,- sizeBase: 16,- sizeLg: 20,- sizeSm: 13,- sizeXl: 25,- sizeXs: 10,- supportingLeading: 1.5385,- supportingSize: 12,- supportingWeight: 400,- weightBold: 700,- weightMedium: 500,- weightNormal: 400,- weightSemibold: 600+ body: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ code: TypeStyleTokens(size: 16, weight: 400, leading: 1.5),+ display1: TypeStyleTokens(size: 61, weight: 400, leading: 1.2459),+ display2: TypeStyleTokens(size: 49, weight: 400, leading: 1.2245),+ display3: TypeStyleTokens(size: 39, weight: 400, leading: 1.2308),+ family: FontFamilyTokens(body: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"], code: ["JetBrains Mono", "SF Mono", "Monaco", "Consolas", "monospace"], heading: ["Poppins", "-apple-system", "BlinkMacSystemFont", "Segoe UI", "Roboto", "Helvetica", "Arial", "sans-serif"]),+ heading1: TypeStyleTokens(size: 31, weight: 600, leading: 1.4194),+ heading2: TypeStyleTokens(size: 25, weight: 600, leading: 1.44),+ heading3: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ heading4: TypeStyleTokens(size: 16, weight: 600, leading: 1.5),+ heading5: TypeStyleTokens(size: 13, weight: 600, leading: 1.5385),+ heading6: TypeStyleTokens(size: 10, weight: 600, leading: 1.6),+ label: TypeStyleTokens(size: 16, weight: 500, leading: 1.5),+ large: TypeStyleTokens(size: 20, weight: 600, leading: 1.4),+ size: FontSizeTokens(base: 16, lg: 20, s2xl: 31, s2xs: 8, s3xl: 39, s3xs: 7, s4xl: 49, s4xs: 5, s5xl: 61, sm: 13, xl: 25, xs: 10),+ supporting: TypeStyleTokens(size: 12, weight: 400, leading: 1.5385),+ weight: FontWeightTokens(bold: 700, medium: 500, normal: 400, semibold: 600))))diff --git a/packages/native/apple/Tests/AstryxTests/EnvironmentTests.swift b/packages/native/apple/Tests/AstryxTests/EnvironmentTests.swiftindex f21b79b8a5..eb9582888d 100644--- a/packages/native/apple/Tests/AstryxTests/EnvironmentTests.swift+++ b/packages/native/apple/Tests/AstryxTests/EnvironmentTests.swift@@ -31,8 +31,8 @@ import Testing}@Test func theDefaultThemeCarriesCoresFontFamilies() {- #expect(Theme.default.light.font.familyBody.first == "-apple-system")- #expect(Theme.default.light.font.familyHeading.isEmpty == false)+ #expect(Theme.default.light.font.family.body.first == "-apple-system")+ #expect(Theme.default.light.font.family.heading.isEmpty == false)}// Theme environment spec, E1: with Bold Text on, a custom face from thediff --git a/packages/native/apple/Tests/AstryxTests/HeadingTests.swift b/packages/native/apple/Tests/AstryxTests/HeadingTests.swiftindex 7d3f599f99..142301ce8a 100644--- a/packages/native/apple/Tests/AstryxTests/HeadingTests.swift+++ b/packages/native/apple/Tests/AstryxTests/HeadingTests.swift@@ -43,7 +43,7 @@ import Testing#expect(largest.width > large.width * 2)var theme = Theme.default- theme.light.font.heading2Size = 48+ theme.light.font.heading2.size = 48theme.light.color.textPrimary = Color(astryxRGBA: 0xFF0000FF)let themed = Pixels(Astryx.Heading("Settings", level: .v2).fixedSize(), theme: theme)#expect(themed.width > large.width)diff --git a/packages/native/apple/Tests/AstryxTests/TextTests.swift b/packages/native/apple/Tests/AstryxTests/TextTests.swiftindex 76bc5dd6bf..f73e247f64 100644--- a/packages/native/apple/Tests/AstryxTests/TextTests.swift+++ b/packages/native/apple/Tests/AstryxTests/TextTests.swift@@ -36,12 +36,12 @@ import Testing@MainActor@Test func everyTypeReadsItsOwnTokens() {let font = Theme.default.light.font- #expect(font.style(.body) == TypeStyle(size: font.bodySize, weight: font.bodyWeight, families: font.familyBody))- #expect(font.style(.code)?.families == font.familyCode)- #expect(font.style(.code)?.size == font.codeSize)- #expect(font.style(.display1)?.size == font.display1Size)- #expect(font.style(.display2)?.families == font.familyHeading)- #expect(font.style(.display3)?.weight == font.display3Weight)+ #expect(font.style(.body) == TypeStyle(font.body, families: font.family.body))+ #expect(font.style(.code)?.families == font.family.code)+ #expect(font.style(.code)?.size == font.code.size)+ #expect(font.style(.display1)?.size == font.display1.size)+ #expect(font.style(.display2)?.families == font.family.heading)+ #expect(font.style(.display3)?.weight == font.display3.weight)#expect(font.style(.inherit) == nil)}@@ -49,8 +49,8 @@ import Testing@Test func extraSmallIsSpelledAsCoreSpellsIt() {let font = Theme.default.light.font#expect(TextSize(rawValue: "xsm") == .xsm)- #expect(font.size(.xsm) == font.sizeXs)- #expect(font.size(.v4xl) == font.size4xl)+ #expect(font.size.value(for: .xsm) == font.size.xs)+ #expect(font.size.value(for: .v4xl) == font.size.s4xl)}@MainActordiff --git a/packages/native/apple/Tests/AstryxTests/ThemeTests.swift b/packages/native/apple/Tests/AstryxTests/ThemeTests.swiftindex 7fd32951fa..fa4c3da79c 100644--- a/packages/native/apple/Tests/AstryxTests/ThemeTests.swift+++ b/packages/native/apple/Tests/AstryxTests/ThemeTests.swift@@ -8,7 +8,7 @@ import Testingfor tokens in [Theme.default.light, Theme.default.dark] {#expect(tokens.size.elementMd == 32)#expect(tokens.radius.element == 8)- #expect(tokens.font.familyBody.isEmpty == false)+ #expect(tokens.font.family.body.isEmpty == false)}#expect(Theme.default.light.color.textPrimary != Theme.default.dark.color.textPrimary)}@@ -24,7 +24,7 @@ import Testing#expect(style.space(4) == Theme.default.light.space.s4)#expect(style.size("radius-element", 0) == 8)#expect(style.size("size-missing", 7) == 7)- #expect(style.fontSize("text-body-size", 0) == Theme.default.light.font.bodySize * 1.5)+ #expect(style.fontSize("text-body-size", 0) == Theme.default.light.font.body.size * 1.5)#expect(style.color("color-accent") == Theme.default.light.color.accent)#expect(style.color("color-missing") == .clear)}diff --git a/packages/native/apple/Tests/AstryxTests/TwoThemeTests.swift b/packages/native/apple/Tests/AstryxTests/TwoThemeTests.swiftindex 0778606e88..2c04e1ee7c 100644--- a/packages/native/apple/Tests/AstryxTests/TwoThemeTests.swift+++ b/packages/native/apple/Tests/AstryxTests/TwoThemeTests.swift@@ -17,8 +17,8 @@ private let secondTheme: Theme = {tokens.color.accent = Color(astryxRGBA: 0xC2410CFF)tokens.color.backgroundCard = Color(astryxRGBA: 0xFDE68AFF)tokens.color.textPrimary = Color(astryxRGBA: 0xFF0000FF)- tokens.font.labelSize = 28- tokens.font.bodySize = 30+ tokens.font.label.size = 28+ tokens.font.body.size = 30tokens.radius.container = 0tokens.radius.element = 0return tokensdiff --git a/packages/native/scripts/swift-ios-theme.d.mts b/packages/native/scripts/swift-ios-theme.d.mtsindex c32085f44e..6b9b68df49 100644--- a/packages/native/scripts/swift-ios-theme.d.mts+++ b/packages/native/scripts/swift-ios-theme.d.mts@@ -32,6 +32,9 @@ export declare function localTokensLeftOut(theme: DefinedTheme): string[];export declare function tokenSurface(resolved: Record<string, SwiftMember>,): Record<TokenGroup, {token: string; member: string; type: string}[]>;+export declare function renderTokenTypes(+ surface: Record<TokenGroup, {token: string; member: string; type: string}[]>,+): string;export declare function defaultTheme(): Promise<DefinedTheme>;export declare function defineTheme(input: {name: string;diff --git a/packages/native/scripts/swift-ios-theme.mjs b/packages/native/scripts/swift-ios-theme.mjsindex 9ba82631bc..700010e204 100644--- a/packages/native/scripts/swift-ios-theme.mjs+++ b/packages/native/scripts/swift-ios-theme.mjs@@ -91,11 +91,17 @@ export function swiftMember(token) {return {group: 'size', member: camel(['element', ...m[1].split('-')])};}if (name === 'border-width') return {group: 'size', member: 'borderWidth'};+ // Font tokens group by kind (G6): a type style's size, weight and leading+ // under the style, and the family, size and weight scales under their own.if ((m = /^font-(size|weight|family)-(.+)$/.exec(name))) {- return {group: 'font', member: camel([m[1], ...m[2].split('-')])};+ const leaf = camel(m[2].split('-'));+ return {+ group: 'font',+ member: `${m[1]}.${/^\d/.test(leaf) ? `s${leaf}` : leaf}`,+ };}if ((m = /^text-(.+)-(size|weight|leading)$/.exec(name))) {- return {group: 'font', member: camel([...m[1].split('-'), m[2]])};+ return {group: 'font', member: `${camel(m[1].split('-'))}.${m[2]}`};}return null;}@@ -340,7 +346,11 @@ export function tokenSurface(resolved) {`${seen.get(key)} and ${token} both become ${key} in Swift`,);}- if (!/^[a-z][A-Za-z0-9_]*$/.test(member) || SWIFT_KEYWORDS.has(member)) {+ if (+ !member+ .split('.')+ .every(p => /^[a-z][A-Za-z0-9_]*$/.test(p) && !SWIFT_KEYWORDS.has(p))+ ) {throw new Error(`${token} becomes ${key}, which Swift cannot name`);}seen.set(key, token);@@ -357,9 +367,137 @@ export function tokenSurface(resolved) {const GENERATED_NOTE = `// Do not edit. Run \`${REGENERATE}\` after a theme or core token change.`;+// Font sub-groups (G6): the family, size and weight scales each have their own+// struct; every other sub-group is a type style with a size, weight and leading.+const FONT_SCALES = {+ family: 'FontFamilyTokens',+ size: 'FontSizeTokens',+ weight: 'FontWeightTokens',+};+const TYPE_STYLE_PARTS = ['size', 'weight', 'leading'];++/** Font members by sub-group: `[[name, [{token, leaf, type}]]]`, sorted. */+function fontGroups(members) {+ const groups = new Map();+ for (const m of members) {+ const [name, leaf] = m.member.split('.');+ if (!groups.has(name)) groups.set(name, []);+ groups.get(name).push({...m, leaf});+ }+ for (const [name, parts] of groups) {+ if (name in FONT_SCALES) {+ parts.sort((a, b) => a.leaf.localeCompare(b.leaf, 'en'));+ continue;+ }+ const leaves = parts.map(p => p.leaf).sort();+ if (leaves.join() !== [...TYPE_STYLE_PARTS].sort().join()) {+ throw new Error(+ `type style ${name} needs a size, weight and leading token, got ${leaves.join(', ')}`,+ );+ }+ parts.sort(+ (a, b) =>+ TYPE_STYLE_PARTS.indexOf(a.leaf) - TYPE_STYLE_PARTS.indexOf(b.leaf),+ );+ }+ return [...groups].sort(([a], [b]) => a.localeCompare(b, 'en'));+}++const fontStructName = name => FONT_SCALES[name] ?? 'TypeStyleTokens';++function renderStruct(name, doc, members) {+ return `${doc}+public struct ${name}: Equatable, Sendable {+${members.map(m => `${m.doc ? ` /// ${m.doc}\n` : ''} public var ${m.name}: ${m.type}`).join('\n')}++ public init(+${members.map(m => ` ${m.name}: ${m.type}`).join(',\n')}+ ) {+${members.map(m => ` self.${m.name} = ${m.name}`).join('\n')}+ }+}`;+}++/** FontTokens and its sub-group structs, for the font members of a surface. */+function renderFontTypes(members) {+ const groups = fontGroups(members);+ const cssName = t => t.replace(/^--/, '');+ const lookup = type =>+ members+ .filter(m => m.type === type)+ .map(m => ` case "${cssName(m.token)}": ${m.member}`)+ .join('\n');+ const font = renderStruct(+ 'FontTokens',+ "/// The theme's `font` tokens, grouped by kind: each type style's size,\n/// weight and leading, and the family, size and weight scales.",+ groups.map(([name, parts]) => ({+ name,+ type: fontStructName(name),+ doc:+ name in FONT_SCALES+ ? `\`--font-${name}-*\``+ : `\`--text-${cssName(parts[0].token)+ .replace(/^text-/, '')+ .replace(/-(size|weight|leading)$/, '')}-*\``,+ })),+ ).replace(+ /\n}$/,+ `++ /// A size, weight, or line-height token by its CSS name, for code that+ /// only has the name. Components read the typed members instead.+ func number(named token: String) -> CGFloat? {+ switch token {+${lookup('CGFloat')}+ default: nil+ }+ }++ /// A font family token by its CSS name, for code that only has the name.+ func families(named token: String) -> [String]? {+ switch token {+${lookup('[String]')}+ default: nil+ }+ }+}`,+ );+ const typeStyle = renderStruct(+ 'TypeStyleTokens',+ '/// One type style: its font size, numeric weight, and line height.',+ TYPE_STYLE_PARTS.map(name => ({name, type: 'CGFloat'})),+ );+ const scales = Object.entries(FONT_SCALES)+ .map(([name, struct]) => {+ const parts = groups.find(([n]) => n === name)?.[1] ?? [];+ return renderStruct(+ struct,+ `/// The theme's \`font-${name}\` tokens.`,+ parts.map(p => ({name: p.leaf, type: p.type, doc: `\`${p.token}\``})),+ );+ })+ .join('\n\n');+ return `${font}\n\n${typeStyle}\n\n${scales}`;+}++/** The Swift initializer of FontTokens for one mode. */+function renderFontValue(members, resolved, pad) {+ const groups = fontGroups(members);+ const args = groups+ .map(([name, parts]) => {+ const inner = parts+ .map(p => `${p.leaf}: ${swiftValue(p.type, resolved[p.token].value)}`)+ .join(', ');+ return `${pad} ${name}: ${fontStructName(name)}(${inner})`;+ })+ .join(',\n');+ return `${pad} font: FontTokens(\n${args}\n${pad} )`;+}+/** The generated Tokens.swift for a token surface. */export function renderTokenTypes(surface) {const structs = GROUPS.map(group => {+ if (group === 'font') return renderFontTypes(surface.font);const members = surface[group];const props = members.map(@@ -449,6 +587,7 @@ function swiftValue(type, value) {function renderMode(surface, resolved, indent) {const pad = ' '.repeat(indent);const groups = GROUPS.map(group => {+ if (group === 'font') return renderFontValue(surface.font, resolved, pad);const args = surface[group].map(m =>diff --git a/packages/native/specs/swift/library/theme-generator.md b/packages/native/specs/swift/library/theme-generator.mdindex 82dcc8ab3f..f752c4118b 100644--- a/packages/native/specs/swift/library/theme-generator.md+++ b/packages/native/specs/swift/library/theme-generator.md@@ -37,7 +37,10 @@ re-implements theme logic.- **G3 — One shared token type, one file per theme.**- `apple/Sources/Astryx/Theme/Generated/Tokens.swift` declares the typedtoken surface: `Tokens` with one member per group (`color`, `space`,- `radius`, `size`, `font`), each a struct with one typed member per token.+ `radius`, `size`, `font`), each a struct with one typed member per token,+ except `font`, whose members are the sub-groups G6 names: a+ `TypeStyleTokens` per type style and `FontFamilyTokens`, `FontSizeTokens`,+ and `FontWeightTokens` for the scales.It is generated from core's resolved token names, which are the same forevery theme (G5), so it does not depend on any one theme.- Type names follow the Swift component API spec: unprefixed, in the@@ -72,17 +75,21 @@ re-implements theme logic.is its group and the rest of its name in lower camel case, with each `-`between two digits written `_`:- | Token | Member |- | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------- |- | `color-<rest>` | `color.<rest>`: `color-text-primary` → `color.textPrimary`, `color-data-blue-1` → `color.dataBlue1` |- | `spacing-<n>` | `space.s<n>`: `spacing-4` → `space.s4`, `spacing-0-5` → `space.s0_5` |- | `radius-<rest>` | `radius.<rest>`: `radius-element` → `radius.element` |- | `size-element-<rest>`, `border-width` | `size.element<Rest>`: `size-element-md` → `size.elementMd`; `size.borderWidth` |- | `font-size-<rest>`, `font-weight-<rest>`, `font-family-<rest>` | `font.size<Rest>`, `font.weight<Rest>`, `font.family<Rest>`: `font-size-2xl` → `font.size2xl`, `font-family-body` → `font.familyBody` |- | `text-<style>-<part>` | `font.<style><Part>`: `text-body-size` → `font.bodySize`, `text-heading-1-weight` → `font.heading1Weight` |-- Two tokens that map to the same member, or a member that is a Swift keyword- or does not start with a letter, fail the run with both token names.+ | Token | Member |+ | ---------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |+ | `color-<rest>` | `color.<rest>`: `color-text-primary` → `color.textPrimary`, `color-data-blue-1` → `color.dataBlue1` |+ | `spacing-<n>` | `space.s<n>`: `spacing-4` → `space.s4`, `spacing-0-5` → `space.s0_5` |+ | `radius-<rest>` | `radius.<rest>`: `radius-element` → `radius.element` |+ | `size-element-<rest>`, `border-width` | `size.element<Rest>`: `size-element-md` → `size.elementMd`; `size.borderWidth` |+ | `text-<style>-<part>` | `font.<style>.<part>`, one `TypeStyleTokens` per style with `size`, `weight`, and `leading`: `text-body-size` → `font.body.size`, `text-heading-1-weight` → `font.heading1.weight` |+ | `font-family-<rest>` | `font.family.<rest>`: `font-family-body` → `font.family.body` |+ | `font-size-<rest>`, `font-weight-<rest>` | `font.size.<rest>`, `font.weight.<rest>`, with a name that starts with a digit taking `s`: `font-size-2xl` → `font.size.s2xl`, `font-size-base` → `font.size.base`, `font-weight-bold` → `font.weight.bold` |++ Font tokens group by kind because each type style is several tokens a+ view reads together: a view takes `font.body` whole, and a style missing its+ size, weight, or leading fails the run naming the style. Two tokens that map+ to the same member, or a member part that is a Swift keyword or does not+ start with a letter, fail the run with both token names.- **G7 — Values are typed and exact, or the run fails.**- Colors are `Color` values in sRGB, from `#RGB`, `#RGBA`, `#RRGGBB`,@@ -149,11 +156,11 @@ re-implements theme logic.| G3 | `swiftc -typecheck` compiles `Tokens.swift` and every theme file together; each theme file declares one `Theme` static named as G3 says; two themes with the same name fail the run. || G4 | Generating twice, and on two CI machines, gives byte-identical output. || G5 | Every theme's light and dark values fill every member of `Tokens`, equal to core's resolved names filtered by the G5 groups. |-| G6 | Unit tests map every row of the G6 table; two tokens that collide fail with both names. A Swift fixture referencing `theme.color.textPrimray` fails to compile. |+| G6 | Unit tests map every row of the G6 table; two tokens that collide fail with both names; a type style without its leading fails naming the style; `Tokens.swift` declares one `TypeStyleTokens` and every theme fills `font.body`, `font.display1`, and `font.heading1` as one. A Swift fixture referencing `theme.color.textPrimray` fails to compile. || G7 | A token written as `light-dark(#000, #fff)` generates black in light and white in dark. `hsl(210 100% 50%)` generates the same color as `#0080FF`. Unit tests convert every listed form; `oklch(0 0 0 / 5%)` in a kept group fails with theme, mode, token, and value in the message; `"Figtree", -apple-system, sans-serif` becomes `["Figtree", "-apple-system", "sans-serif"]`. || G8 | Neutral's local tokens generate nothing today and each is reported; a fixture whose local tokens come back per mode generates its values keyed by their exact custom-property names in that theme's `local` maps, none in `Tokens`. || G9 | A source check finds no token lookup by string in any component. |-| G10 | On iOS and macOS, a Swift test with no bundled Figtree resolves `font.familyBody` to the system font and with a registered test font resolves to that font; on iOS, both scale between Large and AX5. |+| G10 | On iOS and macOS, a Swift test with no bundled Figtree resolves `font.family.body` to the system font and with a registered test font resolves to that font; on iOS, both scale between Large and AX5. || G11 | `Theme.native` exists, is documented, and holds no values. || G12 | A test reads `packages/themes/*/package.json` and finds one generated file per non-private package plus `default`. A fixture product theme renders through `renderSwiftTheme`. || G13 | Editing one generated value or member name by hand fails the drift test with the regenerate command in the message. |@@ -200,7 +207,10 @@ re-implements theme logic.product (generated contract types) and the `Astryx` product (SwiftUI views).- The generator writes the typed `Tokens.swift` and one theme file for core'sdefaults and each published theme package (`Theme.default`, `Theme.neutral`,- and so on), under `apple/Sources/Astryx/Theme/Generated/`.+ and so on), under `apple/Sources/Astryx/Theme/Generated/`. Font tokens are+ grouped by type style (`font.body`, `font.code`, `font.display1`–`3`,+ `font.heading1`–`6`, `font.label`, `font.large`, `font.supporting`) and by+ scale (`font.family`, `font.size`, `font.weight`).- Core's `resolveThemeTokens` returns shared tokens per mode and no localtokens; neutral declares local tokens, stored as `light-dark(…)` strings.- Published theme packages: butter, chocolate, gothic, matcha, neutral, stone,diff --git a/packages/native/src/theme/swiftIOSTheme.test.ts b/packages/native/src/theme/swiftIOSTheme.test.tsindex 044a02632b..b6553214b3 100644--- a/packages/native/src/theme/swiftIOSTheme.test.ts+++ b/packages/native/src/theme/swiftIOSTheme.test.ts@@ -17,6 +17,7 @@ import {toFamilies,toHexColor,toPoints,+ renderTokenTypes,tokenSurface,valueForMode,} from '../../scripts/swift-ios-theme.mjs';@@ -35,11 +36,13 @@ describe('swift theme generator: names (G6)', () => {'--radius-element': 'radius.element','--size-element-md': 'size.elementMd','--border-width': 'size.borderWidth',- '--font-size-2xl': 'font.size2xl',- '--font-weight-semibold': 'font.weightSemibold',- '--font-family-body': 'font.familyBody',- '--text-body-size': 'font.bodySize',- '--text-heading-1-weight': 'font.heading1Weight',+ '--font-size-2xl': 'font.size.s2xl',+ '--font-size-base': 'font.size.base',+ '--font-weight-semibold': 'font.weight.semibold',+ '--font-family-body': 'font.family.body',+ '--text-body-size': 'font.body.size',+ '--text-heading-1-weight': 'font.heading1.weight',+ '--text-display-1-leading': 'font.display1.leading',};for (const [token, expected] of Object.entries(cases)) {const mapped = swiftMember(token);@@ -58,6 +61,36 @@ describe('swift theme generator: names (G6)', () => {).toThrow(/--color-a-1 and --color-a1 both become color.a1/);});+ it('groups font tokens by type style and scale', () => {+ const swift = renderTokenTypes(+ tokenSurface({+ '--text-body-size': {group: 'font', member: 'body.size'},+ '--text-body-weight': {group: 'font', member: 'body.weight'},+ '--text-body-leading': {group: 'font', member: 'body.leading'},+ '--font-family-body': {group: 'font', member: 'family.body'},+ '--font-size-2xl': {group: 'font', member: 'size.s2xl'},+ '--font-weight-bold': {group: 'font', member: 'weight.bold'},+ }),+ );+ expect(swift).toContain('public var body: TypeStyleTokens');+ expect(swift).toContain('public var family: FontFamilyTokens');+ expect(swift).toContain('public struct TypeStyleTokens');+ expect(swift).toContain('public var s2xl: CGFloat');+ expect(swift).toContain('case "text-body-size": body.size');+ expect(swift).toContain('case "font-family-body": family.body');+ });++ it('fails a type style that is missing a part, naming the style', () => {+ expect(() =>+ renderTokenTypes(+ tokenSurface({+ '--text-body-size': {group: 'font', member: 'body.size'},+ '--text-body-weight': {group: 'font', member: 'body.weight'},+ }),+ ),+ ).toThrow(/type style body needs a size, weight and leading/);+ });+it('names themes as the spec says', () => {expect(swiftThemeName('astryx')).toBe('default');expect(swiftThemeName('astryx-neutral')).toBe('neutral');