@atlaskit/tokens 1.21.1 → 1.22.0

package/dist/types-ts4.5/tokens/atlassian-typography-adg3/theme.d.ts

@@ -1,10 +1,145 @@
-import type { FontFamilyBaseToken, FontSizeBaseToken, FontWeightBaseToken, LetterSpacingBaseToken, LineHeightBaseToken } from '../../palettes/typography-palette';
-import type { TypographyTokenSchema, ValueSchema } from '../../types';
-declare const typography: ValueSchema<TypographyTokenSchema<{
-    fontWeight: FontWeightBaseToken;
-    fontFamily: FontFamilyBaseToken;
-    fontSize: FontSizeBaseToken;
-    lineHeight: LineHeightBaseToken;
-    letterSpacing: LetterSpacingBaseToken;
-}>>;
-export default typography;
+import type { UtilTokenSchema, ValueSchema } from '../../types';
+declare const _default: {
+    font: {
+        body: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            lg: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        code: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        heading: {
+            lg: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            md: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xl: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xs: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xxl: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xxs: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        ui: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+    };
+    utility: ValueSchema<UtilTokenSchema<"Lime100" | "Lime200" | "Lime300" | "Lime400" | "Lime500" | "Lime600" | "Lime700" | "Lime800" | "Lime900" | "Lime1000" | "Red100" | "Red200" | "Red300" | "Red400" | "Red500" | "Red600" | "Red700" | "Red800" | "Red900" | "Red1000" | "Orange100" | "Orange200" | "Orange300" | "Orange400" | "Orange500" | "Orange600" | "Orange700" | "Orange800" | "Orange900" | "Orange1000" | "Yellow100" | "Yellow200" | "Yellow300" | "Yellow400" | "Yellow500" | "Yellow600" | "Yellow700" | "Yellow800" | "Yellow900" | "Yellow1000" | "Green100" | "Green200" | "Green300" | "Green400" | "Green500" | "Green600" | "Green700" | "Green800" | "Green900" | "Green1000" | "Teal100" | "Teal200" | "Teal300" | "Teal400" | "Teal500" | "Teal600" | "Teal700" | "Teal800" | "Teal900" | "Teal1000" | "Blue100" | "Blue200" | "Blue300" | "Blue400" | "Blue500" | "Blue600" | "Blue700" | "Blue800" | "Blue900" | "Blue1000" | "Purple100" | "Purple200" | "Purple300" | "Purple400" | "Purple500" | "Purple600" | "Purple700" | "Purple800" | "Purple900" | "Purple1000" | "Magenta100" | "Magenta200" | "Magenta300" | "Magenta400" | "Magenta500" | "Magenta600" | "Magenta700" | "Magenta800" | "Magenta900" | "Magenta1000" | "Neutral0" | "Neutral100" | "Neutral200" | "Neutral300" | "Neutral400" | "Neutral500" | "Neutral600" | "Neutral700" | "Neutral800" | "Neutral900" | "Neutral1000" | "Neutral1100" | "Neutral100A" | "Neutral200A" | "Neutral300A" | "Neutral400A" | "Neutral500A" | "DarkNeutral-100" | "DarkNeutral0" | "DarkNeutral100" | "DarkNeutral200" | "DarkNeutral250" | "DarkNeutral300" | "DarkNeutral350" | "DarkNeutral400" | "DarkNeutral500" | "DarkNeutral600" | "DarkNeutral700" | "DarkNeutral800" | "DarkNeutral900" | "DarkNeutral1000" | "DarkNeutral1100" | "DarkNeutral-100A" | "DarkNeutral100A" | "DarkNeutral200A" | "DarkNeutral250A" | "DarkNeutral300A" | "DarkNeutral350A" | "DarkNeutral400A" | "DarkNeutral500A">>;
+};
+export default _default;

package/dist/types-ts4.5/tokens/atlassian-typography-minor3/theme.d.ts

@@ -1,10 +1,145 @@
-import type { FontFamilyBaseToken, FontSizeBaseToken, FontWeightBaseToken, LetterSpacingBaseToken, LineHeightBaseToken } from '../../palettes/typography-palette';
-import type { TypographyTokenSchema, ValueSchema } from '../../types';
-declare const typography: ValueSchema<TypographyTokenSchema<{
-    fontWeight: FontWeightBaseToken;
-    fontFamily: FontFamilyBaseToken;
-    fontSize: FontSizeBaseToken;
-    lineHeight: LineHeightBaseToken;
-    letterSpacing: LetterSpacingBaseToken;
-}>>;
-export default typography;
+import type { UtilTokenSchema, ValueSchema } from '../../types';
+declare const _default: {
+    font: {
+        body: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            lg: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        code: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        heading: {
+            lg: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            md: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xl: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xs: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xxl: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            xxs: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+        ui: {
+            '[default]': {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+            sm: {
+                value: {
+                    fontSize: import("../../palettes/typography-palette").FontSizeScaleValues;
+                    fontWeight: import("../../palettes/typography-palette").FontWeightScaleValues;
+                    fontFamily: "font.family.body" | "font.family.code" | "font.family.heading" | "font.family.monospace" | "font.family.sans" | "font.family.brand";
+                    lineHeight: import("../../palettes/typography-palette").LineHeightScaleValues;
+                    letterSpacing: import("../../palettes/typography-palette").LetterSpacingScaleValues;
+                    fontStyle: "normal";
+                };
+            };
+        };
+    };
+    utility: ValueSchema<UtilTokenSchema<"Lime100" | "Lime200" | "Lime300" | "Lime400" | "Lime500" | "Lime600" | "Lime700" | "Lime800" | "Lime900" | "Lime1000" | "Red100" | "Red200" | "Red300" | "Red400" | "Red500" | "Red600" | "Red700" | "Red800" | "Red900" | "Red1000" | "Orange100" | "Orange200" | "Orange300" | "Orange400" | "Orange500" | "Orange600" | "Orange700" | "Orange800" | "Orange900" | "Orange1000" | "Yellow100" | "Yellow200" | "Yellow300" | "Yellow400" | "Yellow500" | "Yellow600" | "Yellow700" | "Yellow800" | "Yellow900" | "Yellow1000" | "Green100" | "Green200" | "Green300" | "Green400" | "Green500" | "Green600" | "Green700" | "Green800" | "Green900" | "Green1000" | "Teal100" | "Teal200" | "Teal300" | "Teal400" | "Teal500" | "Teal600" | "Teal700" | "Teal800" | "Teal900" | "Teal1000" | "Blue100" | "Blue200" | "Blue300" | "Blue400" | "Blue500" | "Blue600" | "Blue700" | "Blue800" | "Blue900" | "Blue1000" | "Purple100" | "Purple200" | "Purple300" | "Purple400" | "Purple500" | "Purple600" | "Purple700" | "Purple800" | "Purple900" | "Purple1000" | "Magenta100" | "Magenta200" | "Magenta300" | "Magenta400" | "Magenta500" | "Magenta600" | "Magenta700" | "Magenta800" | "Magenta900" | "Magenta1000" | "Neutral0" | "Neutral100" | "Neutral200" | "Neutral300" | "Neutral400" | "Neutral500" | "Neutral600" | "Neutral700" | "Neutral800" | "Neutral900" | "Neutral1000" | "Neutral1100" | "Neutral100A" | "Neutral200A" | "Neutral300A" | "Neutral400A" | "Neutral500A" | "DarkNeutral-100" | "DarkNeutral0" | "DarkNeutral100" | "DarkNeutral200" | "DarkNeutral250" | "DarkNeutral300" | "DarkNeutral350" | "DarkNeutral400" | "DarkNeutral500" | "DarkNeutral600" | "DarkNeutral700" | "DarkNeutral800" | "DarkNeutral900" | "DarkNeutral1000" | "DarkNeutral1100" | "DarkNeutral-100A" | "DarkNeutral100A" | "DarkNeutral200A" | "DarkNeutral250A" | "DarkNeutral300A" | "DarkNeutral350A" | "DarkNeutral400A" | "DarkNeutral500A">>;
+};
+export default _default;

package/dist/types-ts4.5/types.d.ts

@@ -64,6 +64,18 @@ export interface DesignToken<TValue, Group extends Groups> extends Token<TValue,
         suggest?: string[];
     };
 }
+/**
+ * @example
+ * ```ts
+ * const object = { font: { heading: { h900: { value: 'hello' } }}}
+ * // -> `font.heading.h900`
+ * ```
+ */
+type FlattenKeys<T, Prefix extends string = ''> = {
+    [Key in keyof T]: T[Key] extends object ? T[Key] extends {
+        value: string;
+    } ? `${Prefix}${Key & string}` : `${Prefix}${Key & string}.${FlattenKeys<T[Key]>}` : `${Prefix}.${Key & string}`;
+}[keyof T];
 type OmitDistributive<T, K extends PropertyKey> = T extends any ? T extends object ? Id<DeepOmit<T, K>> : T : never;
 type Id<T> = {} & {
     [P in keyof T]: T[P];
@@ -904,6 +916,7 @@ export interface UtilTokenSchema<BaseToken> {
     };
     UNSAFE: {
         transparent: RawToken;
+        textTransformUppercase?: RawToken;
     };
 }
 export interface SurfaceTokenSchema<BaseToken> {
@@ -991,7 +1004,7 @@ export type TypographyToken<TPalette extends {
 }> = DesignToken<{
     fontStyle: 'normal';
     fontWeight: TPalette['fontWeight'];
-    fontFamily: TPalette['fontFamily'];
+    fontFamily: FlattenKeys<FontFamilyTokenSchema<any>>;
     fontSize: TPalette['fontSize'];
     lineHeight: TPalette['lineHeight'];
     letterSpacing: TPalette['letterSpacing'];
@@ -1094,7 +1107,8 @@ export interface FontFamilyTokenSchema<BaseToken> {
              * @deprecated
              */
             monospace: DeprecatedTypographyToken<BaseToken>;
-            product: DeprecatedTypographyToken<BaseToken>;
+            body: DeprecatedTypographyToken<BaseToken>;
+            heading: DeprecatedTypographyToken<BaseToken>;
             brand: DeprecatedTypographyToken<BaseToken>;
             code: DeprecatedTypographyToken<BaseToken>;
         };

package/figma/atlassian-typography-adg3.json

@@ -1,25 +1,25 @@
 {
   "name": "Typography adg3",
   "tokens": {
-    "Typography adg3/font.family.code": {
+    "Typography adg3/font.family.body": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
         "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
-      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+      "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
-    "Typography adg3/font.family.monospace": {
+    "Typography adg3/font.family.code": {
       "attributes": {
         "group": "fontFamily",
-        "state": "active",
-        "introduced": "0.10.33",
+        "state": "experimental",
+        "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
       "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
     },
-    "Typography adg3/font.family.product": {
+    "Typography adg3/font.family.heading": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
@@ -28,6 +28,15 @@
       },
       "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
+    "Typography adg3/font.family.monospace": {
+      "attributes": {
+        "group": "fontFamily",
+        "state": "active",
+        "introduced": "0.10.33",
+        "description": "Helpful guidance goes here"
+      },
+      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+    },
     "Typography adg3/font.family.sans": {
       "attributes": {
         "group": "fontFamily",

package/figma/atlassian-typography-minor3.json

@@ -1,25 +1,25 @@
 {
   "name": "Typography minor3",
   "tokens": {
-    "Typography minor3/font.family.code": {
+    "Typography minor3/font.family.body": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
         "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
-      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+      "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
-    "Typography minor3/font.family.monospace": {
+    "Typography minor3/font.family.code": {
       "attributes": {
         "group": "fontFamily",
-        "state": "active",
-        "introduced": "0.10.33",
+        "state": "experimental",
+        "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
       "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
     },
-    "Typography minor3/font.family.product": {
+    "Typography minor3/font.family.heading": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
@@ -28,6 +28,15 @@
       },
       "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
+    "Typography minor3/font.family.monospace": {
+      "attributes": {
+        "group": "fontFamily",
+        "state": "active",
+        "introduced": "0.10.33",
+        "description": "Helpful guidance goes here"
+      },
+      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+    },
     "Typography minor3/font.family.sans": {
       "attributes": {
         "group": "fontFamily",

package/figma/atlassian-typography.json

@@ -1,25 +1,25 @@
 {
   "name": "Typography",
   "tokens": {
-    "Typography/font.family.code": {
+    "Typography/font.family.body": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
         "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
-      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+      "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
-    "Typography/font.family.monospace": {
+    "Typography/font.family.code": {
       "attributes": {
         "group": "fontFamily",
-        "state": "active",
-        "introduced": "0.10.33",
+        "state": "experimental",
+        "introduced": "1.14.0",
         "description": "Helpful guidance goes here"
       },
       "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
     },
-    "Typography/font.family.product": {
+    "Typography/font.family.heading": {
       "attributes": {
         "group": "fontFamily",
         "state": "experimental",
@@ -28,6 +28,15 @@
       },
       "value": "ui-sans-serif, \"Segoe UI\", system-ui, Ubuntu, \"Helvetica Neue\", sans-serif"
     },
+    "Typography/font.family.monospace": {
+      "attributes": {
+        "group": "fontFamily",
+        "state": "active",
+        "introduced": "0.10.33",
+        "description": "Helpful guidance goes here"
+      },
+      "value": "ui-monospace, Menlo, \"Segoe UI Mono\", \"Ubuntu Mono\", monospace"
+    },
     "Typography/font.family.sans": {
       "attributes": {
         "group": "fontFamily",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/tokens",
-  "version": "1.21.1",
+  "version": "1.22.0",
   "description": "Design tokens are the single source of truth to name and store design decisions.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/report.api.md

@@ -469,6 +469,7 @@ export type ActiveTokens =
   | 'space.negative.250'
   | 'space.negative.300'
   | 'space.negative.400'
+  | 'utility.UNSAFE.textTransformUppercase'
   | 'utility.UNSAFE.transparent'
   | 'utility.elevation.surface.current';
 
@@ -1084,6 +1085,7 @@ type CSSTokenMap = {
   'elevation.shadow.raised': 'var(--ds-shadow-raised)';
   'opacity.disabled': 'var(--ds-opacity-disabled)';
   'opacity.loading': 'var(--ds-opacity-loading)';
+  'utility.UNSAFE.textTransformUppercase': 'var(--ds-UNSAFE-textTransformUppercase)';
   'utility.UNSAFE.transparent': 'var(--ds-UNSAFE-transparent)';
   'utility.elevation.surface.current': 'var(--ds-elevation-surface-current)';
   'border.radius.050': 'var(--ds-border-radius-050)';
@@ -1138,9 +1140,10 @@ type CSSTokenMap = {
   'font.letterSpacing.400': 'var(--ds-font-letterSpacing-400)';
   'font.ui': 'var(--ds-font-ui)';
   'font.ui.sm': 'var(--ds-font-ui-sm)';
+  'font.family.body': 'var(--ds-font-family-body)';
   'font.family.code': 'var(--ds-font-family-code)';
+  'font.family.heading': 'var(--ds-font-family-heading)';
   'font.family.monospace': 'var(--ds-font-family-monospace)';
-  'font.family.product': 'var(--ds-font-family-product)';
   'font.family.sans': 'var(--ds-font-family-sans)';
   'font.family.brand': 'var(--ds-font-family-brand)';
   'font.size.050': 'var(--ds-font-size-050)';
@@ -1176,6 +1179,12 @@ type DeletedTokenState = 'deleted';
 // @public (undocumented)
 type DeprecatedTokenState = 'deprecated';
 
+// @public (undocumented)
+type DeprecatedTypographyToken<BaseToken> = DesignToken<
+  BaseToken,
+  'fontFamily' | 'fontSize' | 'fontWeight' | 'letterSpacing' | 'lineHeight'
+>;
+
 // @public
 interface DesignToken<TValue, Group extends Groups>
   extends Token<TValue, Group> {
@@ -1224,6 +1233,32 @@ type ExperimentalTokenState = 'experimental';
 // @public
 type ExtensionThemeId = ThemeIds;
 
+// @public (undocumented)
+type FlattenKeys<T, Prefix extends string = ''> = {
+  [Key in keyof T]: T[Key] extends object
+    ? T[Key] extends {
+        value: string;
+      }
+      ? `${Prefix}${Key & string}`
+      : `${Prefix}${Key & string}.${FlattenKeys<T[Key]>}`
+    : `${Prefix}.${Key & string}`;
+}[keyof T];
+
+// @public (undocumented)
+interface FontFamilyTokenSchema<BaseToken> {
+  // (undocumented)
+  font: {
+    family: {
+      sans: DeprecatedTypographyToken<BaseToken>;
+      monospace: DeprecatedTypographyToken<BaseToken>;
+      body: DeprecatedTypographyToken<BaseToken>;
+      heading: DeprecatedTypographyToken<BaseToken>;
+      brand: DeprecatedTypographyToken<BaseToken>;
+      code: DeprecatedTypographyToken<BaseToken>;
+    };
+  };
+}
+
 // @public (undocumented)
 export const getGlobalTheme: () => Partial<ActiveThemeState>;
 
@@ -1719,6 +1754,7 @@ type InternalTokenIds =
   | 'space.negative.250'
   | 'space.negative.300'
   | 'space.negative.400'
+  | 'utility.UNSAFE.textTransformUppercase'
   | 'utility.UNSAFE.transparent'
   | 'utility.elevation.surface.current';
 
@@ -2347,6 +2383,7 @@ const tokens: {
   readonly 'elevation.shadow.raised': '--ds-shadow-raised';
   readonly 'opacity.disabled': '--ds-opacity-disabled';
   readonly 'opacity.loading': '--ds-opacity-loading';
+  readonly 'utility.UNSAFE.textTransformUppercase': '--ds-UNSAFE-textTransformUppercase';
   readonly 'utility.UNSAFE.transparent': '--ds-UNSAFE-transparent';
   readonly 'utility.elevation.surface.current': '--ds-elevation-surface-current';
   readonly 'border.radius.050': '--ds-border-radius-050';
@@ -2401,9 +2438,10 @@ const tokens: {
   readonly 'font.letterSpacing.400': '--ds-font-letterSpacing-400';
   readonly 'font.ui': '--ds-font-ui';
   readonly 'font.ui.sm': '--ds-font-ui-sm';
+  readonly 'font.family.body': '--ds-font-family-body';
   readonly 'font.family.code': '--ds-font-family-code';
+  readonly 'font.family.heading': '--ds-font-family-heading';
   readonly 'font.family.monospace': '--ds-font-family-monospace';
-  readonly 'font.family.product': '--ds-font-family-product';
   readonly 'font.family.sans': '--ds-font-family-sans';
   readonly 'font.family.brand': '--ds-font-family-brand';
   readonly 'font.size.050': '--ds-font-size-050';
@@ -2450,7 +2488,7 @@ export type TypographyToken<
   {
     fontStyle: 'normal';
     fontWeight: TPalette['fontWeight'];
-    fontFamily: TPalette['fontFamily'];
+    fontFamily: FlattenKeys<FontFamilyTokenSchema<any>>;
     fontSize: TPalette['fontSize'];
     lineHeight: TPalette['lineHeight'];
     letterSpacing: TPalette['letterSpacing'];