Skip to content

Handle duplicate tokens and enable null for f2 overrides #34277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mitch-At-Work merged 2 commits into from
Apr 17, 2025
Merged

Handle duplicate tokens and enable null for f2 overrides #34277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64c5c9b
Handle duplicate tokens and enable null for f2 overrides
Mitch-At-Work Apr 16, 2025
29b3951
Refactor
Mitch-At-Work Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/semantic-tokens/scripts/fluentOverrides.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export type FluentOverrideValue =
rawValue: string;
};

export type FluentOverrides = Record<string, FluentOverrideValue>;
export type FluentOverrides = Record<string, FluentOverrideValue | null>;

export const fluentOverrides: FluentOverrides = {
ctrlFocusOuterStroke: {
Expand Down
12 changes: 8 additions & 4 deletions packages/semantic-tokens/scripts/legacyTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ const generateLegacyTokens = () => {
console.log('Importing required fluent legacy tokens as flat export');

const semanticTokenFallbacks = Object.keys(fluentOverrides);
const exportedTokens: string[] = [];
const comment = '// THIS FILE IS GENERATED AS PART OF THE BUILD PROCESS. DO NOT MANUALLY MODIFY THIS FILE\n';

const generatedTokens = semanticTokenFallbacks.reduce((acc, t) => {
const fluent2Fallback = fluentOverrides[t].f2Token;
if (!fluent2Fallback) {
return '';
const tokenOverride = fluentOverrides[t];
Comment thread
Mitch-At-Work marked this conversation as resolved.
const fluent2Fallback = tokenOverride?.f2Token;
if (!tokenOverride || !fluent2Fallback || exportedTokens.includes(fluent2Fallback)) {
return acc;
}
// Add it to our list of exported tokens
exportedTokens.push(fluent2Fallback);
if (!Object.keys(tokensPackage.tokens).includes(fluent2Fallback)) {
// Token does not exist in F2 tokens
// This should never occur, but let's flag if a mistake was made in fallback token names
throw new Error(`Fluent token ${fluentOverrides[t].f2Token} not found in fluent tokens`);
throw new Error(`Fluent token ${tokenOverride.f2Token} not found in fluent tokens`);
}
const tokenValue = tokensPackage.tokens[fluent2Fallback as keyof typeof tokensPackage.tokens];
const token = `/**
Expand Down